diff --git a/mod/assign/tests/behat/assign_activity_completion.feature b/mod/assign/tests/behat/assign_activity_completion.feature
index a902bb030d9..0ab810f97d2 100644
--- a/mod/assign/tests/behat/assign_activity_completion.feature
+++ b/mod/assign/tests/behat/assign_activity_completion.feature
@@ -115,7 +115,7 @@ Feature: View activity completion in the assignment activity
     And I navigate to "View all submissions" in current page administration
     And I click on "Grade" "link" in the "Vinnie Student1" "table_row"
     And I set the field "Grade out of 100" to "33"
-    And I set the field "Notify students" to "0"
+    And I set the field "Notify student" to "0"
     And I press "Save changes"
     And I follow "View all submissions"
     And I log out
diff --git a/mod/assign/tests/behat/bulk_release_anon_submissions.feature b/mod/assign/tests/behat/bulk_release_anon_submissions.feature
index cd0812bb490..70a48ca1963 100644
--- a/mod/assign/tests/behat/bulk_release_anon_submissions.feature
+++ b/mod/assign/tests/behat/bulk_release_anon_submissions.feature
@@ -62,7 +62,7 @@ Feature: Bulk released grades should not be sent to gradebook while submissions
     And I set the field "Grade out of 100" to "50"
     And I set the field "Marking workflow state" to "In review"
     And I set the field "Feedback comments" to "Great job!"
-    And I set the field "Notify students" to "0"
+    And I set the field "Notify student" to "0"
     And I press "Save changes"
     And I follow "Test assignment name"
     And I navigate to "View all submissions" in current page administration
@@ -71,7 +71,7 @@ Feature: Bulk released grades should not be sent to gradebook while submissions
     And I set the field "Grade out of 100" to "50"
     And I set the field "Marking workflow state" to "In review"
     And I set the field "Feedback comments" to "Great job!"
-    And I set the field "Notify students" to "0"
+    And I set the field "Notify student" to "0"
     And I press "Save changes"
     And I follow "Test assignment name"
     And I navigate to "View all submissions" in current page administration
@@ -86,7 +86,7 @@ Feature: Bulk released grades should not be sent to gradebook while submissions
     Then I should not see "Student 1 (student1@example.com)"
     And I should not see "Student 2 (student2@example.com)"
     And I set the field "Marking workflow state" to "Released"
-    And I set the field "Notify students" to "No"
+    And I set the field "Notify student" to "No"
     And I press "Save changes"
     And I follow "Test assignment name"
     And I navigate to "View all submissions" in current page administration
@@ -136,7 +136,7 @@ Feature: Bulk released grades should not be sent to gradebook while submissions
     Then I should see "Student 1 (student1@example.com)"
     And I should see "Student 2 (student2@example.com)"
     And I set the field "Marking workflow state" to "Released"
-    And I set the field "Notify students" to "No"
+    And I set the field "Notify student" to "No"
     And I press "Save changes"
     And I follow "Test assignment name"
     And I navigate to "View all submissions" in current page administration
diff --git a/mod/assign/tests/behat/display_grade.feature b/mod/assign/tests/behat/display_grade.feature
index e118ebe34ee..1b2c7b7939b 100644
--- a/mod/assign/tests/behat/display_grade.feature
+++ b/mod/assign/tests/behat/display_grade.feature
@@ -31,7 +31,7 @@ Feature: Check that the assignment grade can be updated correctly
     Then I navigate to "View all submissions" in current page administration
     And I click on "Grade" "link" in the "Student 1" "table_row"
     And I set the field "Grade out of 100" to "50"
-    And I set the field "Notify students" to "0"
+    And I set the field "Notify student" to "0"
     And I press "Save changes"
     And I click on "Edit settings" "link"
     And I follow "Test assignment name"
@@ -67,7 +67,7 @@ Feature: Check that the assignment grade can be updated correctly
     When I navigate to "View all submissions" in current page administration
     And I click on "Grade" "link" in the "Student 1" "table_row"
     And I set the field "Grade out of 100" to "50"
-    And I set the field "Notify students" to "0"
+    And I set the field "Notify student" to "0"
     And I press "Save changes"
     And I click on "Edit settings" "link"
     And I follow "Test assignment name"
diff --git a/mod/assign/tests/behat/filter_by_marker.feature b/mod/assign/tests/behat/filter_by_marker.feature
index 8bbad795e8d..f625eb7b781 100644
--- a/mod/assign/tests/behat/filter_by_marker.feature
+++ b/mod/assign/tests/behat/filter_by_marker.feature
@@ -35,7 +35,7 @@ Feature: In an assignment, teachers can filter displayed submissions by assigned
     And I navigate to "View all submissions" in current page administration
     And I click on "Grade" "link" in the "Student 1" "table_row"
     And I set the field "allocatedmarker" to "Marker 1"
-    And I set the field "Notify students" to "0"
+    And I set the field "Notify student" to "0"
     And I press "Save changes"
     And I click on "Edit settings" "link"
 
diff --git a/mod/assign/tests/behat/grading_app_filters.feature b/mod/assign/tests/behat/grading_app_filters.feature
index a0f93283f55..3a1d3570b0d 100644
--- a/mod/assign/tests/behat/grading_app_filters.feature
+++ b/mod/assign/tests/behat/grading_app_filters.feature
@@ -42,7 +42,7 @@ Feature: In an assignment, teachers can change filters in the grading app
     And I should not see "Test assignment name &"
     And I set the field "allocatedmarker" to "Marker 1"
     And I set the field "workflowstate" to "In marking"
-    And I set the field "Notify students" to "0"
+    And I set the field "Notify student" to "0"
     And I press "Save changes"
 
     And I am on the "Test assignment name &" Activity page
@@ -62,7 +62,7 @@ Feature: In an assignment, teachers can change filters in the grading app
     And I click on "Grade" "link" in the "Student 1" "table_row"
     And I set the field "allocatedmarker" to "Marker 1"
     And I set the field "workflowstate" to "In marking"
-    And I set the field "Notify students" to "0"
+    And I set the field "Notify student" to "0"
     And I press "Save changes"
 
     And I am on the "Test assignment name &" Activity page
diff --git a/mod/assign/tests/behat/grading_status.feature b/mod/assign/tests/behat/grading_status.feature
index 8a10bc7fe1b..4b8cc4cdb9c 100644
--- a/mod/assign/tests/behat/grading_status.feature
+++ b/mod/assign/tests/behat/grading_status.feature
@@ -46,7 +46,7 @@ Feature: View the grading status of an assignment
     And I set the field "Grade out of 100" to "50"
     And I set the field "Marking workflow state" to "In review"
     And I set the field "Feedback comments" to "Great job! Lol, not really."
-    And I set the field "Notify students" to "0"
+    And I set the field "Notify student" to "0"
     And I press "Save changes"
     And I am on the "Test assignment name" "assign activity" page
     And I navigate to "View all submissions" in current page administration
@@ -82,7 +82,7 @@ Feature: View the grading status of an assignment
     And I click on "Grade" "link" in the "Student 1" "table_row"
     And I should see "1 of 1"
     And I set the field "Marking workflow state" to "In marking"
-    And I set the field "Notify students" to "0"
+    And I set the field "Notify student" to "0"
     And I press "Save changes"
     And I am on the "Test assignment name" "assign activity" page
     And I navigate to "View all submissions" in current page administration
diff --git a/mod/assign/tests/behat/steps_blind_marking.feature b/mod/assign/tests/behat/steps_blind_marking.feature
index 26a717f7598..dfbb3c5c8c4 100644
--- a/mod/assign/tests/behat/steps_blind_marking.feature
+++ b/mod/assign/tests/behat/steps_blind_marking.feature
@@ -40,7 +40,7 @@ Feature: Assignments correctly add feedback to the grade report when workflow an
     And I set the field "Grade out of 100" to "50"
     And I set the field "Marking workflow state" to "In review"
     And I set the field "Feedback comments" to "Great job! Lol, not really."
-    And I set the field "Notify students" to "0"
+    And I set the field "Notify student" to "0"
     And I press "Save changes"
     And I click on "Edit settings" "link"
     And I follow "Test assignment name"
@@ -51,7 +51,7 @@ Feature: Assignments correctly add feedback to the grade report when workflow an
   Scenario: Student identities are revealed after releasing the grades.
     When I click on "Grade" "link" in the "I'm the student's first submission" "table_row"
     And I set the field "Marking workflow state" to "Ready for release"
-    And I set the field "Notify students" to "0"
+    And I set the field "Notify student" to "0"
     And I press "Save changes"
     And I click on "Edit settings" "link"
     And I follow "Test assignment name"
@@ -77,7 +77,7 @@ Feature: Assignments correctly add feedback to the grade report when workflow an
   Scenario: Student identities are revealed before releasing the grades.
     When I click on "Grade" "link" in the "I'm the student's first submission" "table_row"
     And I set the field "Marking workflow state" to "Ready for release"
-    And I set the field "Notify students" to "0"
+    And I set the field "Notify student" to "0"
     And I press "Save changes"
     And I click on "Edit settings" "link"
     And I follow "Test assignment name"