diff --git a/admin/tests/behat/outgoing_mail.feature b/admin/tests/behat/outgoing_mail.feature
index 960d18329c5..822c4c6c94c 100644
--- a/admin/tests/behat/outgoing_mail.feature
+++ b/admin/tests/behat/outgoing_mail.feature
@@ -7,13 +7,13 @@ Feature: Outgoing mail configuration
   Background:
     Given I log in as "admin"
 
-  Scenario: SMTP Auth Type without OAuth 2 Service setup yet
+  Scenario: SMTP Auth Type without OAuth 2 service setup yet
     Given I navigate to "Server > Email > Outgoing mail configuration" in site administration
     And I should not see "XOAUTH2" in the "SMTP Auth Type" "select"
     And I should see "LOGIN" in the "SMTP Auth Type" "select"
     And I should see "PLAIN" in the "SMTP Auth Type" "select"
 
-  Scenario: SMTP Auth Type with OAuth 2 Service setup
+  Scenario: SMTP Auth Type with OAuth 2 service setup
     Given I navigate to "Server > OAuth 2 services" in site administration
     And I press "Google"
     And I should see "Create new service: Google"
@@ -26,4 +26,4 @@ Feature: Outgoing mail configuration
     Then I should see "XOAUTH2" in the "SMTP Auth Type" "select"
     And I should see "LOGIN" in the "SMTP Auth Type" "select"
     And I should see "PLAIN" in the "SMTP Auth Type" "select"
-    And I should see "Testing service" in the "OAuth 2 Service" "select"
+    And I should see "Testing service" in the "OAuth 2 service" "select"
diff --git a/admin/tool/messageinbound/tests/behat/incoming_mail.feature b/admin/tool/messageinbound/tests/behat/incoming_mail.feature
index 664e6cba243..b8974244a12 100644
--- a/admin/tool/messageinbound/tests/behat/incoming_mail.feature
+++ b/admin/tool/messageinbound/tests/behat/incoming_mail.feature
@@ -7,11 +7,11 @@ Feature: Incoming mail configuration
   Background:
     Given I log in as "admin"
 
-  Scenario: Incoming mail server settings without OAuth 2 Service setup yet
+  Scenario: Incoming mail server settings without OAuth 2 service setup yet
     Given I navigate to "Server > Email > Incoming mail configuration" in site administration
-    And "OAuth 2 Service" "select" should not exist
+    And "OAuth 2 service" "select" should not exist
 
-  Scenario: Incoming mail server settings with OAuth 2 Service setup
+  Scenario: Incoming mail server settings with OAuth 2 service setup
     Given I navigate to "Server > OAuth 2 services" in site administration
     And I press "Google"
     And I should see "Create new service: Google"
@@ -21,5 +21,5 @@ Feature: Incoming mail configuration
       | Client secret | supersecret       |
     And I press "Save changes"
     When I navigate to "Server > Email > Incoming mail configuration" in site administration
-    Then "OAuth 2 Service" "select" should exist
-    And I should see "Testing service" in the "OAuth 2 Service" "select"
+    Then "OAuth 2 service" "select" should exist
+    And I should see "Testing service" in the "OAuth 2 service" "select"
diff --git a/lib/tests/modinfolib_test.php b/lib/tests/modinfolib_test.php
index 0f8ffd3a584..f99049a1d1f 100644
--- a/lib/tests/modinfolib_test.php
+++ b/lib/tests/modinfolib_test.php
@@ -1125,7 +1125,7 @@ class modinfolib_test extends advanced_testcase {
 
         // Assert exception text.
         $this->expectException(\moodle_exception::class);
-        $this->expectExceptionMessage('Invalid course module id: ' . $forum1->cmid);
+        $this->expectExceptionMessage('Invalid course module ID: ' . $forum1->cmid);
         delete_course($course, false);
     }
 
diff --git a/mod/data/tests/behat/edit_templates.feature b/mod/data/tests/behat/edit_templates.feature
index 3a4d85ec907..e33f26cacbb 100644
--- a/mod/data/tests/behat/edit_templates.feature
+++ b/mod/data/tests/behat/edit_templates.feature
@@ -86,23 +86,23 @@ Feature: Users can edit the database templates
     And I set the following fields to these values:
       | Repeated entry | <span class="hideme">Nope</span>Yep! |
     And I click on "Save" "button" in the "sticky-footer" "region"
-    And I set the field "Templates tertiary navigation" to "CSS template"
+    And I set the field "Templates tertiary navigation" to "Custom CSS"
     And I set the following fields to these values:
-      | CSS template | .hideme {display: none;} |
+      | Custom CSS | .hideme {display: none;} |
     And I click on "Save" "button" in the "sticky-footer" "region"
     When I navigate to "Database" in current page administration
     Then I should not see "Nope"
     And I should see "Yep!"
 
   @javascript
-  Scenario: Edit Javascript template
+  Scenario: Edit Custom JavaScript
     Given I click on "Enable code editor" "checkbox"
     And I set the following fields to these values:
       | Repeated entry | <span id="hideme">Nope</span>Yep! |
     And I click on "Save" "button" in the "sticky-footer" "region"
-    And I set the field "Templates tertiary navigation" to "Javascript template"
+    And I set the field "Templates tertiary navigation" to "Custom JavaScript"
     And I set the following fields to these values:
-      | Javascript template | window.onload = () => document.querySelector('#hideme').style.display = 'none'; |
+      | Custom JavaScript | window.onload = () => document.querySelector('#hideme').style.display = 'none'; |
     And I click on "Save" "button" in the "sticky-footer" "region"
     When I navigate to "Database" in current page administration
     Then I should not see "Nope"
diff --git a/mod/quiz/accessrule/seb/tests/external/validate_quiz_access_test.php b/mod/quiz/accessrule/seb/tests/external/validate_quiz_access_test.php
index 4767e654b46..bb6d1791805 100644
--- a/mod/quiz/accessrule/seb/tests/external/validate_quiz_access_test.php
+++ b/mod/quiz/accessrule/seb/tests/external/validate_quiz_access_test.php
@@ -147,7 +147,7 @@ class validate_quiz_access_test extends \advanced_testcase {
         $this->setAdminUser();
         $forum = $this->getDataGenerator()->create_module('forum', ['course' => $this->course->id]);
         $this->expectException(\invalid_parameter_exception::class);
-        $this->expectExceptionMessage('Quiz not found matching course module id: ' . $forum->cmid);
+        $this->expectExceptionMessage('Quiz not found matching course module ID: ' . $forum->cmid);
         validate_quiz_keys::execute($forum->cmid, 'https://www.example.com/moodle', 'configkey');
     }
 
diff --git a/mod/quiz/tests/behat/editing_set_marks_no_attempts.feature b/mod/quiz/tests/behat/editing_set_marks_no_attempts.feature
index 5a558465e6f..5fcde062bee 100644
--- a/mod/quiz/tests/behat/editing_set_marks_no_attempts.feature
+++ b/mod/quiz/tests/behat/editing_set_marks_no_attempts.feature
@@ -68,7 +68,7 @@ Feature: Edit quiz marks with no attempts
     And I am on the "Quiz 1" "quiz activity editing" page
     When I set the following fields to these values:
       | Decimal places in grades | 3 |
-      | Decimal places in question grades | 5 |
+      | Decimal places in marks for questions | 5 |
     And I press "Save and display"
     When I am on the "Quiz 1" "mod_quiz > Edit" page
     # Then the field "maxgrade" matches value "20.000" -- with exact match on decimal places.
diff --git a/mod/quiz/tests/behat/editing_set_marks_with_attempts.feature b/mod/quiz/tests/behat/editing_set_marks_with_attempts.feature
index c20750885cb..e3214eb88ba 100644
--- a/mod/quiz/tests/behat/editing_set_marks_with_attempts.feature
+++ b/mod/quiz/tests/behat/editing_set_marks_with_attempts.feature
@@ -72,7 +72,7 @@ Feature: Edit quiz marks with attempts
     When I am on the "Quiz 1" "quiz activity editing" page
     And I set the following fields to these values:
       | Decimal places in grades | 3 |
-      | Decimal places in question grades | 5 |
+      | Decimal places in marks for questions | 5 |
     And I press "Save and display"
     And I am on the "Quiz 1" "mod_quiz > Edit" page
     # Then the field "maxgrade" matches value "20.000" -- with exact match on decimal places.
diff --git a/mod/quiz/tests/behat/preview.feature b/mod/quiz/tests/behat/preview.feature
index 2ada3f291e6..8d681aba98a 100644
--- a/mod/quiz/tests/behat/preview.feature
+++ b/mod/quiz/tests/behat/preview.feature
@@ -69,7 +69,7 @@ Feature: Preview a quiz as a teacher
       | TF1      | 1    |         |
       | TF2      | 1    | 3.0     |
     When I am on the "Quiz 2" "mod_quiz > View" page logged in as "admin"
-    And I should see "This quiz is not currently available"
+    And I should see "This quiz is currently not available."
     And I press "Preview quiz"
     Then I should see "if this were a real attempt, you would be blocked" in the ".alert-warning" "css_element"