diff --git a/mod/assign/tests/behat/assign_activity_completion.feature b/mod/assign/tests/behat/assign_activity_completion.feature
index 31da6e1c7ad..93b090ef88b 100644
--- a/mod/assign/tests/behat/assign_activity_completion.feature
+++ b/mod/assign/tests/behat/assign_activity_completion.feature
@@ -74,7 +74,7 @@ Feature: View activity completion in the assignment activity
     And the manual completion button for "Music history" should exist
 
   @javascript
-  Scenario: Use manual completion from the activity page
+  Scenario: A student can manually mark the assign activity as done but a teacher cannot
     Given I am on the "Music history" "assign activity" page logged in as teacher1
     # Teacher view.
     And the manual completion button for "Music history" should be disabled
diff --git a/mod/book/tests/behat/book_activity_completion.feature b/mod/book/tests/behat/book_activity_completion.feature
index 01c521aa9da..9cca99cb957 100644
--- a/mod/book/tests/behat/book_activity_completion.feature
+++ b/mod/book/tests/behat/book_activity_completion.feature
@@ -65,7 +65,7 @@ Feature: View activity completion information in the book activity
     Then the "View" completion condition of "Art history" is displayed as "done"
 
   @javascript
-  Scenario: Use manual completion
+  Scenario: A student can manually mark the book activity as done but a teacher cannot
     Given I am on the "Music history" "book activity editing" page logged in as teacher1
     And I expand all fieldsets
     And I set the field "Completion tracking" to "Students can manually mark the activity as completed"
diff --git a/mod/chat/tests/behat/chat_activity_completion.feature b/mod/chat/tests/behat/chat_activity_completion.feature
index 1068ea23b77..80dfb24617a 100644
--- a/mod/chat/tests/behat/chat_activity_completion.feature
+++ b/mod/chat/tests/behat/chat_activity_completion.feature
@@ -36,7 +36,7 @@ Feature: View activity completion information in the chat activity
     Then the "View" completion condition of "Music history" is displayed as "done"
 
   @javascript
-  Scenario: Use manual completion
+  Scenario: A student can manually mark the chat activity as done but a teacher cannot
     Given I log in as "teacher1"
     And the following "activity" exists:
       | activity       | chat          |
diff --git a/mod/data/tests/behat/data_activity_completion.feature b/mod/data/tests/behat/data_activity_completion.feature
index e2817abc14b..b56094a2a82 100644
--- a/mod/data/tests/behat/data_activity_completion.feature
+++ b/mod/data/tests/behat/data_activity_completion.feature
@@ -88,7 +88,7 @@ Feature: View activity completion in the database activity
     And "Vinnie Student1" user has completed "Music history" activity
 
   @javascript
-  Scenario: Use manual completion
+  Scenario: A student can manually mark the data activity as done but a teacher cannot
     Given I am on the "Music history" "data activity editing" page logged in as teacher1
     And I expand all fieldsets
     And I set the field "Completion tracking" to "Students can manually mark the activity as completed"
diff --git a/mod/feedback/tests/behat/feedback_activity_completion.feature b/mod/feedback/tests/behat/feedback_activity_completion.feature
index baeee4ed2c4..1a1356e8fba 100644
--- a/mod/feedback/tests/behat/feedback_activity_completion.feature
+++ b/mod/feedback/tests/behat/feedback_activity_completion.feature
@@ -52,7 +52,7 @@ Feature: View activity completion in the feedback activity
     And the "Submit feedback" completion condition of "Music history" is displayed as "done"
 
   @javascript
-  Scenario: Use manual completion
+  Scenario: A student can manually mark the feedback activity as done but a teacher cannot
     Given I am on the "Music history" "feedback activity editing" page logged in as teacher1
     And I expand all fieldsets
     And I set the field "Completion tracking" to "Students can manually mark the activity as completed"
diff --git a/mod/folder/tests/behat/folder_activity_completion.feature b/mod/folder/tests/behat/folder_activity_completion.feature
index 821d73656f0..69b0fc4ad8b 100644
--- a/mod/folder/tests/behat/folder_activity_completion.feature
+++ b/mod/folder/tests/behat/folder_activity_completion.feature
@@ -37,7 +37,7 @@ Feature: View activity completion information in the folder activity
     Then the "View" completion condition of "Music history" is displayed as "done"
 
   @javascript
-  Scenario: Use manual completion
+  Scenario: A student can manually mark the folder activity as done but a teacher cannot
     Given the following "activity" exists:
       | activity       | folder        |
       | course         | C1            |
diff --git a/mod/forum/tests/behat/forum_activity_completion.feature b/mod/forum/tests/behat/forum_activity_completion.feature
index f44b142304a..95334f9bc06 100644
--- a/mod/forum/tests/behat/forum_activity_completion.feature
+++ b/mod/forum/tests/behat/forum_activity_completion.feature
@@ -85,7 +85,7 @@ Feature: View activity completion in the forum activity
     And the "Receive a grade" completion condition of "Music history" is displayed as "done"
 
   @javascript
-  Scenario: Use manual completion
+  Scenario: A student can manually mark the forum activity as done but a teacher cannot
     Given I am on the "Music history" "forum activity editing" page logged in as teacher1
     And I expand all fieldsets
     And I set the field "Completion tracking" to "Students can manually mark the activity as completed"
diff --git a/mod/glossary/tests/behat/glossary_activity_completion.feature b/mod/glossary/tests/behat/glossary_activity_completion.feature
index 2d6121e0eeb..d25d613de6c 100644
--- a/mod/glossary/tests/behat/glossary_activity_completion.feature
+++ b/mod/glossary/tests/behat/glossary_activity_completion.feature
@@ -66,7 +66,7 @@ Feature: View activity completion in the glossary activity
     And the "Receive a grade" completion condition of "Music history" is displayed as "done"
 
   @javascript
-  Scenario: Use manual completion
+  Scenario: A student can manually mark the glossary activity as done but a teacher cannot
     Given I am on the "Music history" "glossary activity editing" page logged in as teacher1
     And I expand all fieldsets
     And I set the field "Completion tracking" to "Students can manually mark the activity as completed"
diff --git a/mod/h5pactivity/tests/behat/h5pactivity_completion.feature b/mod/h5pactivity/tests/behat/h5pactivity_completion.feature
index a0aa1646be3..1aaf22707b0 100644
--- a/mod/h5pactivity/tests/behat/h5pactivity_completion.feature
+++ b/mod/h5pactivity/tests/behat/h5pactivity_completion.feature
@@ -25,7 +25,7 @@ Feature: View activity completion information in the h5p activity
       | completionusegrade | 1                                    |
       | packagefilepath    | h5p/tests/fixtures/filltheblanks.h5p |
 
-  Scenario: Use manual completion
+  Scenario: A student can manually mark the h5p activity as done but a teacher cannot
     Given I am on the "Music history" "h5pactivity activity editing" page logged in as teacher1
     And I expand all fieldsets
     And I set the field "Completion tracking" to "Students can manually mark the activity as completed"
diff --git a/mod/imscp/tests/behat/imscp_activity_completion.feature b/mod/imscp/tests/behat/imscp_activity_completion.feature
index bd5e79ce240..db271bb537a 100644
--- a/mod/imscp/tests/behat/imscp_activity_completion.feature
+++ b/mod/imscp/tests/behat/imscp_activity_completion.feature
@@ -26,7 +26,7 @@ Feature: View activity completion information in the IMS content package activit
     Then the "View" completion condition of "Music history" is displayed as "done"
 
   @javascript
-  Scenario: Use manual completion
+  Scenario: A student can manually mark the IMSCP activity as done but a teacher cannot
     Given the following "activities" exist:
       | activity | course | name          | completion | packagefilepath                            |
       | imscp    | C1     | Music history | 1          | mod/imscp/tests/packages/singescobasic.zip |
diff --git a/mod/lesson/tests/behat/lesson_activity_completion.feature b/mod/lesson/tests/behat/lesson_activity_completion.feature
index cf4471be97d..13a7a553c2b 100644
--- a/mod/lesson/tests/behat/lesson_activity_completion.feature
+++ b/mod/lesson/tests/behat/lesson_activity_completion.feature
@@ -66,7 +66,7 @@ Feature: View activity completion in the lesson activity
     And the "Receive a grade" completion condition of "Music history" is displayed as "done"
 
   @javascript
-  Scenario: Use manual completion
+  Scenario: A student can manually mark the lesson activity as done but a teacher cannot
     Given I am on the "Music history" "lesson activity editing" page logged in as teacher1
     And I expand all fieldsets
     And I set the field "Completion tracking" to "Students can manually mark the activity as completed"
diff --git a/mod/lti/tests/behat/lti_activity_completion.feature b/mod/lti/tests/behat/lti_activity_completion.feature
index fbdf3a7db52..8c477fe5f22 100644
--- a/mod/lti/tests/behat/lti_activity_completion.feature
+++ b/mod/lti/tests/behat/lti_activity_completion.feature
@@ -39,7 +39,7 @@ Feature: View activity completion information in the LTI activity
     And the "View" completion condition of "Music history" is displayed as "done"
 
   @javascript
-  Scenario: Use manual completion
+  Scenario: A student can manually mark the LTI activity as done but a teacher cannot
     Given I am on the "Music history" "lti activity editing" page logged in as teacher1
     And I expand all fieldsets
     And I set the field "Completion tracking" to "Students can manually mark the activity as completed"
diff --git a/mod/page/tests/behat/page_activity_completion.feature b/mod/page/tests/behat/page_activity_completion.feature
index 0531b5a7e2c..514a12dcfa8 100644
--- a/mod/page/tests/behat/page_activity_completion.feature
+++ b/mod/page/tests/behat/page_activity_completion.feature
@@ -43,7 +43,7 @@ Feature: View activity completion information in the Page resource
     Then the "View" completion condition of "Music history" is displayed as "done"
 
   @javascript
-  Scenario: Use manual completion as teacher
+  Scenario: A teacher cannot manually mark the page activity as done
     Given the following "activity" exists:
       | activity   | page                     |
       | course     | C1                       |
@@ -56,7 +56,7 @@ Feature: View activity completion information in the Page resource
     Then the manual completion button for "Music history" should be disabled
 
   @javascript
-  Scenario: Use manual completion as student
+  Scenario: A student can manually mark the page activity as done
     Given the following "activity" exists:
       | activity   | page                     |
       | course     | C1                       |
diff --git a/mod/quiz/tests/behat/completion_manual.feature b/mod/quiz/tests/behat/completion_manual.feature
index a34f3518313..2434ca73865 100644
--- a/mod/quiz/tests/behat/completion_manual.feature
+++ b/mod/quiz/tests/behat/completion_manual.feature
@@ -32,7 +32,7 @@ Feature: Manually complete a quiz
       | First question | 1    |
 
   @javascript
-  Scenario: Use manual completion
+  Scenario: A student can manually mark the quiz activity as done but a teacher cannot
     Given I am on the "Test quiz name" "quiz activity" page logged in as teacher1
     And the manual completion button for "Test quiz name" should be disabled
     And I log out
diff --git a/mod/scorm/tests/behat/scorm_activity_completion.feature b/mod/scorm/tests/behat/scorm_activity_completion.feature
index 1950d6c6f85..ee05ac705e6 100644
--- a/mod/scorm/tests/behat/scorm_activity_completion.feature
+++ b/mod/scorm/tests/behat/scorm_activity_completion.feature
@@ -108,7 +108,7 @@ Feature: View activity completion in the SCORM activity
     And the "Complete or pass the activity" completion condition of "Music history" is displayed as "done"
 
   @javascript
-  Scenario: Use manual completion
+  Scenario: A student can manually mark the scorm activity as done but a teacher cannot
     Given I am on the "Music history" "scorm activity" page logged in as teacher1
     And I navigate to "Settings" in current page administration
     And I expand all fieldsets
diff --git a/mod/survey/tests/behat/survey_completion.feature b/mod/survey/tests/behat/survey_completion.feature
index 40da03acc37..043c899f5fb 100644
--- a/mod/survey/tests/behat/survey_completion.feature
+++ b/mod/survey/tests/behat/survey_completion.feature
@@ -51,7 +51,7 @@ Feature: A teacher can use activity completion to track a student progress
     And the "Submit answers" completion condition of "Test survey name" is displayed as "done"
 
   @javascript
-  Scenario: Use manual completion
+  Scenario: A student can manually mark the survey activity as done but a teacher cannot
     Given the following "activities" exist:
       | activity   | name                   | course | idnumber    | completion |
       | survey     | Test survey name       | C1     | survey1     | 1          |
diff --git a/mod/url/tests/behat/url_activity_completion.feature b/mod/url/tests/behat/url_activity_completion.feature
index f95e8b6c6b7..086d3a97fe8 100644
--- a/mod/url/tests/behat/url_activity_completion.feature
+++ b/mod/url/tests/behat/url_activity_completion.feature
@@ -140,7 +140,7 @@ Feature: View activity completion information in the URL resource
     Then the "View" completion condition of "Music history" is displayed as "done"
 
   @javascript
-  Scenario: Use manual completion with automatic URL as teacher
+  Scenario: A teacher cannot manually mark the url activity as done
     Given the following "activity" exists:
       | activity       | url                 |
       | course         | C1                  |
@@ -155,7 +155,7 @@ Feature: View activity completion information in the URL resource
     Then the manual completion button for "Music history" should be disabled
 
   @javascript
-  Scenario: Use manual completion with automatic URL as student
+  Scenario: A student can manually mark the url activity as done
     Given the following "activity" exists:
       | activity       | url                 |
       | course         | C1                  |
diff --git a/mod/wiki/tests/behat/wiki_activity_completion.feature b/mod/wiki/tests/behat/wiki_activity_completion.feature
index 8c017a42159..7376ecca159 100644
--- a/mod/wiki/tests/behat/wiki_activity_completion.feature
+++ b/mod/wiki/tests/behat/wiki_activity_completion.feature
@@ -45,7 +45,7 @@ Feature: View activity completion information in the Wiki activity
     Then the "View" completion condition of "Music history" is displayed as "done"
 
   @javascript
-  Scenario: Use manual completion
+  Scenario: A student can manually mark the wiki activity as done but a teacher cannot
     Given I am on the "Music history" "wiki activity" page logged in as teacher1
     And I am on the "Music history" "wiki activity editing" page
     And I expand all fieldsets
diff --git a/mod/workshop/tests/behat/workshop_activity_completion.feature b/mod/workshop/tests/behat/workshop_activity_completion.feature
index ba5c2a09ad8..11ae1fe2a1e 100644
--- a/mod/workshop/tests/behat/workshop_activity_completion.feature
+++ b/mod/workshop/tests/behat/workshop_activity_completion.feature
@@ -65,7 +65,7 @@ Feature: View activity completion information in the Workshop activity
     And the "Receive a grade" completion condition of "Music history" is displayed as "done"
 
   @javascript
-  Scenario: Use manual completion
+  Scenario: A student can manually mark the workshop activity as done but a teacher cannot
     Given I am on the "Music history" "workshop activity" page
     And I am on the "Music history" "workshop activity editing" page
     And I expand all fieldsets