diff --git a/grade/tests/behat/grade_aggregation.feature b/grade/tests/behat/grade_aggregation.feature
index 1df72b7fd4a..6dffd302b00 100644
--- a/grade/tests/behat/grade_aggregation.feature
+++ b/grade/tests/behat/grade_aggregation.feature
@@ -58,7 +58,7 @@ Feature: We can use calculated grade totals
       | Hidden | 1 |
     And I set the following settings for grade item "Test assignment eight":
       | Hidden | 1 |
-    And I navigate to "Course grade settings" node in "Grade administration > Settings"
+    And I navigate to "Course grade settings" node in "Grade administration > Setup"
     And I set the field "Grade display type" to "Real (percentage)"
     And I press "Save changes"
 
@@ -73,7 +73,7 @@ Feature: We can use calculated grade totals
       | Exclude empty grades | 0              |
     And I turn editing mode off
     Then I should see "30.00 (30.00 %)" in the ".course" "css_element"
-    And I navigate to "Course grade settings" node in "Grade administration > Settings"
+    And I navigate to "Course grade settings" node in "Grade administration > Setup"
     And I set the field "Hide totals if they contain hidden items" to "Show totals excluding hidden items"
     And I press "Save changes"
     And I log out
@@ -98,7 +98,7 @@ Feature: We can use calculated grade totals
       | Item weight | 3 |
     And I turn editing mode off
     Then I should see "27.14 (27.14 %)" in the ".course" "css_element"
-    And I navigate to "Course grade settings" node in "Grade administration > Settings"
+    And I navigate to "Course grade settings" node in "Grade administration > Setup"
     And I set the field "Hide totals if they contain hidden items" to "Show totals excluding hidden items"
     And I press "Save changes"
     And I log out
@@ -121,7 +121,7 @@ Feature: We can use calculated grade totals
       | Extra credit | 1 |
     And I turn editing mode off
     Then I should see "45.19 (45.19 %)" in the ".course" "css_element"
-    And I navigate to "Course grade settings" node in "Grade administration > Settings"
+    And I navigate to "Course grade settings" node in "Grade administration > Setup"
     And I set the field "Hide totals if they contain hidden items" to "Show totals excluding hidden items"
     And I press "Save changes"
     And I log out
@@ -144,7 +144,7 @@ Feature: We can use calculated grade totals
       | Extra credit weight  | 2 |
     And I turn editing mode off
     Then I should see "42.50 (42.50 %)" in the ".course" "css_element"
-    And I navigate to "Course grade settings" node in "Grade administration > Settings"
+    And I navigate to "Course grade settings" node in "Grade administration > Setup"
     And I set the field "Hide totals if they contain hidden items" to "Show totals excluding hidden items"
     And I press "Save changes"
     And I log out
@@ -165,7 +165,7 @@ Feature: We can use calculated grade totals
       | Exclude empty grades | 0                |
     And I turn editing mode off
     Then I should see "26.67 (26.67 %)" in the ".course" "css_element"
-    And I navigate to "Course grade settings" node in "Grade administration > Settings"
+    And I navigate to "Course grade settings" node in "Grade administration > Setup"
     And I set the field "Hide totals if they contain hidden items" to "Show totals excluding hidden items"
     And I press "Save changes"
     And I log out
@@ -190,7 +190,7 @@ Feature: We can use calculated grade totals
       | Hidden | 1 |
     And I turn editing mode off
     Then I should see "0.00 (0.00 %)" in the ".course" "css_element"
-    And I navigate to "Course grade settings" node in "Grade administration > Settings"
+    And I navigate to "Course grade settings" node in "Grade administration > Setup"
     And I set the field "Hide totals if they contain hidden items" to "Show totals excluding hidden items"
     And I press "Save changes"
     And I log out
@@ -213,7 +213,7 @@ Feature: We can use calculated grade totals
       | Hidden | 1 |
     And I turn editing mode off
     Then I should see "50.00 (50.00 %)" in the ".course" "css_element"
-    And I navigate to "Course grade settings" node in "Grade administration > Settings"
+    And I navigate to "Course grade settings" node in "Grade administration > Setup"
     And I set the field "Hide totals if they contain hidden items" to "Show totals excluding hidden items"
     And I press "Save changes"
     And I log out
@@ -236,7 +236,7 @@ Feature: We can use calculated grade totals
       | Hidden | 1 |
     And I turn editing mode off
     Then I should see "50.00 (50.00 %)" in the ".course" "css_element"
-    And I navigate to "Course grade settings" node in "Grade administration > Settings"
+    And I navigate to "Course grade settings" node in "Grade administration > Setup"
     And I set the field "Hide totals if they contain hidden items" to "Show totals excluding hidden items"
     And I press "Save changes"
     And I log out
@@ -264,7 +264,7 @@ Feature: We can use calculated grade totals
       | Extra credit | 1 |
     And I turn editing mode off
     Then I should see "152.68 (24.43 %)" in the ".course" "css_element"
-    And I navigate to "Course grade settings" node in "Grade administration > Settings"
+    And I navigate to "Course grade settings" node in "Grade administration > Setup"
     And I set the field "report_overview_showtotalsifcontainhidden" to "Show totals excluding hidden items"
     And I set the field "report_user_showtotalsifcontainhidden" to "Show totals excluding hidden items"
     And I set the field "Show contribution to course total" to "Show"
@@ -317,7 +317,7 @@ Feature: We can use calculated grade totals
     And I set the following settings for grade item "Course 1":
       | Aggregation          | Natural |
       | Exclude empty grades | 0       |
-    And I navigate to "Set up grades layout" node in "Grade administration > Settings"
+    And I navigate to "Categories and items" node in "Grade administration > Setup"
     And I press "Add category"
     And I click on "Show more" "link"
     And I set the following fields to these values:
@@ -372,7 +372,7 @@ Feature: We can use calculated grade totals
     And I press "Save changes"
     And I turn editing mode off
     And I should see "250.00 (25.25 %)" in the ".course" "css_element"
-    And I navigate to "Set up grades layout" node in "Grade administration > Settings"
+    And I navigate to "Categories and items" node in "Grade administration > Setup"
     And I press "Add category"
     And I set the following fields to these values:
       | Category name | Sub sub category 1 |
@@ -383,7 +383,7 @@ Feature: We can use calculated grade totals
 
   @javascript
   Scenario: Natural aggregation from the setup screen
-    And I set the field "Grade report" to "Set up grades layout"
+    And I set the field "Grade report" to "Categories and items"
     And I follow "Edit   Course 1"
     And I set the field "Aggregation" to "Natural"
     And I press "Save changes"
@@ -448,7 +448,7 @@ Feature: We can use calculated grade totals
       | Aggregation          | Natural |
       | Exclude empty grades | 0       |
     And I turn editing mode off
-    And I set the field "Grade report" to "Set up grades layout"
+    And I set the field "Grade report" to "Categories and items"
     And I set the field "Override weight of Test assignment one" to "1"
     And I set the field "Weight of Test assignment one" to "0"
     And I set the field "Override weight of Test assignment six" to "1"
@@ -456,7 +456,7 @@ Feature: We can use calculated grade totals
     And I set the field "Override weight of Test assignment nine" to "1"
     And I set the field "Weight of Test assignment nine" to "100"
     And I press "Save changes"
-    And I navigate to "Course grade settings" node in "Grade administration > Settings"
+    And I navigate to "Course grade settings" node in "Grade administration > Setup"
     And I set the field "report_overview_showtotalsifcontainhidden" to "Show totals excluding hidden items"
     And I set the field "report_user_showtotalsifcontainhidden" to "Show totals excluding hidden items"
     And I set the field "Show contribution to course total" to "Show"
diff --git a/grade/tests/behat/grade_calculated_weights.feature b/grade/tests/behat/grade_calculated_weights.feature
index ccab3c0e780..fc61a26b4ac 100644
--- a/grade/tests/behat/grade_calculated_weights.feature
+++ b/grade/tests/behat/grade_calculated_weights.feature
@@ -39,11 +39,11 @@ Feature: We can understand the gradebook user report
     And I give the grade "70.00" to the user "Student 1" for the grade item "Test assignment five"
     And I give the grade "30.00" to the user "Student 1" for the grade item "Test assignment six"
     And I press "Save changes"
-    And I navigate to "Course grade settings" node in "Grade administration > Settings"
+    And I navigate to "Course grade settings" node in "Grade administration > Setup"
     And I set the field "Show weightings" to "Show"
     And I set the field "Show contribution to course total" to "Show"
     And I press "Save changes"
-    And I set the field "Grade report" to "Set up grades layout"
+    And I set the field "Grade report" to "Categories and items"
     And I press "Add category"
     And I set the field "Category name" to "Sub category"
     And I press "Save changes"
@@ -226,7 +226,7 @@ Feature: We can understand the gradebook user report
       | Test assignment five | 33.33 % | 70.00 | 23.33 |
       | Test assignment six | 33.33 % | 30.00 | 10.00 |
       | Category totalWeighted mean of grades. | 33.33 % | 36.67 | - |
-      | Course totalNatural. | - | 156.67 | - |
+      | Course total | - | 156.67 | - |
 
   @javascript
   Scenario: View user report with natural aggregation
@@ -244,5 +244,5 @@ Feature: We can understand the gradebook user report
       | Test assignment four | 33.33 % | 10.00 | 10.00 |
       | Test assignment five | 33.33 % | 70.00 | 70.00 |
       | Test assignment six | 33.33 % | 30.00 | 30.00 |
-      | Category totalNatural. | 60.00 % | 110.00 | - |
-      | Course totalNatural. | - | 230.00 | - |
+      | Category total | 60.00 % | 110.00 | - |
+      | Course total | - | 230.00 | - |
diff --git a/grade/tests/behat/grade_mingrade.feature b/grade/tests/behat/grade_mingrade.feature
index 9be0f0ba7a8..05d80527ee3 100644
--- a/grade/tests/behat/grade_mingrade.feature
+++ b/grade/tests/behat/grade_mingrade.feature
@@ -28,7 +28,7 @@ Feature: We can use a minimum grade different than zero
     And I am on homepage
     And I follow "Course 1"
     And I follow "Grades"
-    And I navigate to "Set up grades layout" node in "Grade administration > Settings"
+    And I navigate to "Categories and items" node in "Grade administration > Setup"
     And I press "Add grade item"
     And I set the following fields to these values:
       | Item name | Manual item 1 |
@@ -66,14 +66,14 @@ Feature: We can use a minimum grade different than zero
       | Minimum grade | 50 |
       | Grade category | Sub category 2 |
     And I press "Save changes"
-    And I navigate to "Course grade settings" node in "Grade administration > Settings"
+    And I navigate to "Course grade settings" node in "Grade administration > Setup"
     And I set the field "Show weightings" to "Show"
     And I set the field "Show contribution to course total" to "Show"
     And I press "Save changes"
 
   @javascript
   Scenario: Natural aggregation with negative and positive grade
-    And I navigate to "Set up grades layout" node in "Grade administration > Settings"
+    And I navigate to "Categories and items" node in "Grade administration > Setup"
     And I set the following settings for grade item "Sub category 1":
       | Aggregation          | Natural |
       | Exclude empty grades | 0       |
diff --git a/grade/tests/behat/grade_natural_normalisation.feature b/grade/tests/behat/grade_natural_normalisation.feature
index d806c4005f4..5512a3f8be1 100644
--- a/grade/tests/behat/grade_natural_normalisation.feature
+++ b/grade/tests/behat/grade_natural_normalisation.feature
@@ -33,7 +33,7 @@ Feature: We can use natural aggregation and weights will be normalised to a tota
     And I log in as "teacher1"
     And I follow "Course 1"
     And I follow "Grades"
-    And I set the field "Grade report" to "Set up grades layout"
+    And I set the field "Grade report" to "Categories and items"
 
   @javascript
   Scenario: Setting all weights in a category to exactly one hundred in total.
diff --git a/grade/tests/behat/grade_scales.feature b/grade/tests/behat/grade_scales.feature
index 3c76991723f..1421da7e8c0 100644
--- a/grade/tests/behat/grade_scales.feature
+++ b/grade/tests/behat/grade_scales.feature
@@ -85,9 +85,9 @@ Feature: View gradebook when scales are used
     And the following should exist in the "user-grade" table:
       | Grade item          | Grade | Range | Percentage |
       | Test assignment one | C     | F–A   | 50.00 %    |
-      | Category totalNatural.      | 3.00  | 0–5   | 60.00 %    |
-      | Course totalNatural.        | 3.00  | 0–5   | 60.00 %    |
-    And I set the field "jump" to "Set up grades layout"
+      | Category total      | 3.00  | 0–5   | 60.00 %    |
+      | Course total        | 3.00  | 0–5   | 60.00 %    |
+    And I set the field "jump" to "Categories and items"
     And the following should exist in the "grade_edit_tree_table" table:
       | Name                | Max grade |
       | Test assignment one | 5.00      |
@@ -100,8 +100,8 @@ Feature: View gradebook when scales are used
     And the following should exist in the "user-grade" table:
       | Grade item          | Grade | Range | Percentage |
       | Test assignment one | B     | F–A   | 75.00 %    |
-      | Category totalNatural.      | 4.00  | 0–5   | 80.00 %    |
-      | Course totalNatural.        | 4.00  | 0–5   | 80.00 %    |
+      | Category total      | 4.00  | 0–5   | 80.00 %    |
+      | Course total        | 4.00  | 0–5   | 80.00 %    |
 
   @javascript
   Scenario Outline: Test displaying scales in gradebook in all other aggregation methods
@@ -135,12 +135,12 @@ Feature: View gradebook when scales are used
       | Test assignment one | C              | F–A   | 50.00 %       |
       | Category total<aggregation>.      | 3.00           | 1–5   | 50.00 %       |
       | Course total<aggregation>.        | <coursetotal3> | 0–100 | <courseperc3> |
-    And I set the field "jump" to "Set up grades layout"
+    And I set the field "jump" to "Categories and items"
     And the following should exist in the "grade_edit_tree_table" table:
       | Name                | Max grade |
       | Test assignment one | A (5)     |
-      | Category total      |           |
-      | Course total        |           |
+      | Category total<aggregation>. |           |
+      | Course total<aggregation>.   |           |
     And I log out
     And I log in as "student2"
     And I follow "Course 1"
diff --git a/grade/tests/behat/grade_view.feature b/grade/tests/behat/grade_view.feature
index cece51a1aac..9ca28d41b02 100644
--- a/grade/tests/behat/grade_view.feature
+++ b/grade/tests/behat/grade_view.feature
@@ -72,23 +72,23 @@ Feature: We can enter in grades and view reports from the gradebook
       | Grade item | Grade | Range | Percentage |
       | Test assignment name 1 | 80.00 | 0–100 | 80.00 % |
       | Test assignment name 2 | 90.00 | 0–100 | 90.00 % |
-      | Course totalNatural. | 170.00 | 0–200 | 85.00 % |
+      | Course total | 170.00 | 0–200 | 85.00 % |
     And the following should not exist in the "user-grade" table:
       | Grade item | Grade | Range | Percentage |
-      | Course totalNatural. | 90.00 | 0–100 | 90.00 % |
+      | Course total | 90.00 | 0–100 | 90.00 % |
     And I set the field "Grade report" to "Overview report"
     And "C1" row "Grade" column of "overview-grade" table should contain "170.00"
     And "C1" row "Grade" column of "overview-grade" table should not contain "90.00"
 
   @javascript
   Scenario: We can add a weighting to a grade item and it is displayed properly in the user report
-    When I set the field "Grade report" to "Set up grades layout"
+    When I set the field "Grade report" to "Categories and items"
     And I set the following settings for grade item "Course 1":
       | Aggregation | Weighted mean of grades |
     And I set the field "Extra credit value for Test assignment name" to "0.72"
     And I press "Save changes"
     And I set the field "Grade report" to "User report"
-    And I navigate to "Course grade settings" node in "Grade administration > Settings"
+    And I navigate to "Course grade settings" node in "Grade administration > Setup"
     And I set the following fields to these values:
       | Show weightings | Show |
     And I press "Save changes"
diff --git a/mod/quiz/tests/behat/completion_condition_attempts_used.feature b/mod/quiz/tests/behat/completion_condition_attempts_used.feature
index 8befe227c1a..ba1a451b11a 100644
--- a/mod/quiz/tests/behat/completion_condition_attempts_used.feature
+++ b/mod/quiz/tests/behat/completion_condition_attempts_used.feature
@@ -49,12 +49,12 @@ Feature: Set a quiz to be marked complete when the student uses all attempts all
       | Feedback for the response 'False'. | So you think it is false                |
     And I follow "Course 1"
     And I follow "Grades"
-    And I navigate to "Set up grades layout" node in "Grade administration > Settings"
+    And I navigate to "Categories and items" node in "Grade administration > Setup"
     And I follow "Edit  quiz Test quiz name"
     Then I should see "Edit grade item"
     And I set the field "gradepass" to "5"
     And I press "Save changes"
-    And I should see "Set up grades layout"
+    And I should see "Categories and items"
     Then I log out
 
     And I log in as "student1"
diff --git a/mod/quiz/tests/behat/completion_condition_passing_grade.feature b/mod/quiz/tests/behat/completion_condition_passing_grade.feature
index aeee71ab2c0..e733d4660c5 100644
--- a/mod/quiz/tests/behat/completion_condition_passing_grade.feature
+++ b/mod/quiz/tests/behat/completion_condition_passing_grade.feature
@@ -48,13 +48,13 @@ Feature: Set a quiz to be marked complete when the student passes
       | Feedback for the response 'False'. | So you think it is false                |
     And I follow "Course 1"
     And I follow "Grades"
-    And I set the field "jump" to "Set up grades layout"
+    And I set the field "jump" to "Categories and items"
     And I press "Go"
     And I follow "Edit  quiz Test quiz name"
     Then I should see "Edit grade item"
     And I set the field "gradepass" to "5"
     And I press "Save changes"
-    Then I should see "Set up grades layout"
+    Then I should see "Categories and items"
     And I log out
 
     And I log in as "student1"