diff --git a/admin/tests/behat/browse_users.feature b/admin/tests/behat/browse_users.feature
index 6c1c92d5a19..e4c247bbc66 100644
--- a/admin/tests/behat/browse_users.feature
+++ b/admin/tests/behat/browse_users.feature
@@ -18,7 +18,7 @@ Feature: An administrator can browse user accounts
     When I navigate to "Users > Accounts > Browse list of users" in site administration
     # Name field always present, email field is default for showidentity.
     Then the following should exist in the "users" table:
-      | First name / Surname | Email address   |
+      | First name / Last name | Email address   |
       | User One             | one@example.com |
       | User Two             | two@example.com |
     # Should not see other identity fields or non-default name fields.
@@ -34,7 +34,7 @@ Feature: An administrator can browse user accounts
       | alternativefullnameformat | firstnamephonetic lastname |
     When I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "users" table:
-      | First name - phonetic / Surname | Email address   |
+      | First name - phonetic / Last name | Email address   |
       | Yewzer One                      | one@example.com |
       | Yoozare Two                     | two@example.com |
 
@@ -43,7 +43,7 @@ Feature: An administrator can browse user accounts
       | showuseridentity | department,profile_field_frog |
     When I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "users" table:
-      | First name / Surname | Favourite frog  | Department |
+      | First name / Last name | Favourite frog  | Department |
       | User One             | Kermit          | Attack     |
       | User Two             | Tree            | Defence    |
     And I should not see "Email address" in the "table" "css_element"
diff --git a/admin/tests/behat/enable_multiple_accounts_use_same_email.feature b/admin/tests/behat/enable_multiple_accounts_use_same_email.feature
index 29eeb4ba942..997db43ef56 100644
--- a/admin/tests/behat/enable_multiple_accounts_use_same_email.feature
+++ b/admin/tests/behat/enable_multiple_accounts_use_same_email.feature
@@ -15,7 +15,7 @@ Feature: Allowing multiple accounts to have the same email address
     And I set the following fields to these values:
       | Username      | s2      |
       | First name    | Jane    |
-      | Surname       | Doe     |
+      | Last name     | Doe     |
       | Email address | <email> |
       | New password  | test    |
     And I press "Create user"
diff --git a/admin/tests/behat/filter_users_settings.feature b/admin/tests/behat/filter_users_settings.feature
index 6916be609b6..ca5427894bf 100644
--- a/admin/tests/behat/filter_users_settings.feature
+++ b/admin/tests/behat/filter_users_settings.feature
@@ -8,7 +8,7 @@ Feature: An administrator can configure the available user list filters
     When I log in as "admin"
     And I navigate to "Users > Accounts > Browse list of users" in site administration
     Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
     And I should not see "Firstname" in the "New filter" "fieldset"
     And I should not see "Username" in the "New filter" "fieldset"
     And I should not see "Email address" in the "New filter" "fieldset"
@@ -30,7 +30,7 @@ Feature: An administrator can configure the available user list filters
     And I should not see "MNet ID provider" in the "New filter" "fieldset"
     And I navigate to "Users > Accounts > Bulk user actions" in site administration
     Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
     And I should not see "Firstname" in the "New filter" "fieldset"
     And I should not see "Username" in the "New filter" "fieldset"
     And I should not see "Email address" in the "New filter" "fieldset"
@@ -57,7 +57,7 @@ Feature: An administrator can configure the available user list filters
     And I log in as "admin"
     And I navigate to "Users > Accounts > Browse list of users" in site administration
     Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
     And I should not see "Firstname" in the "New filter" "fieldset"
     And I should see "Username" in the "New filter" "fieldset"
     And I should see "Email address" in the "New filter" "fieldset"
@@ -79,7 +79,7 @@ Feature: An administrator can configure the available user list filters
     And I should not see "MNet ID provider" in the "New filter" "fieldset"
     And I navigate to "Users > Accounts > Bulk user actions" in site administration
     Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
     And I should not see "Firstname" in the "New filter" "fieldset"
     And I should see "Username" in the "New filter" "fieldset"
     And I should see "Email address" in the "New filter" "fieldset"
@@ -106,7 +106,7 @@ Feature: An administrator can configure the available user list filters
     And I log in as "admin"
     And I navigate to "Users > Accounts > Browse list of users" in site administration
     Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
     And I should not see "Firstname" in the "New filter" "fieldset"
     And I should not see "Username" in the "New filter" "fieldset"
     And I should not see "Email address" in the "New filter" "fieldset"
@@ -128,7 +128,7 @@ Feature: An administrator can configure the available user list filters
     And I should not see "MNet ID provider" in the "New filter" "fieldset"
     And I navigate to "Users > Accounts > Bulk user actions" in site administration
     Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
     And I should not see "Firstname" in the "New filter" "fieldset"
     And I should not see "Username" in the "New filter" "fieldset"
     And I should not see "Email address" in the "New filter" "fieldset"
diff --git a/admin/tool/behat/tests/behat/nasty_strings.feature b/admin/tool/behat/tests/behat/nasty_strings.feature
index 851ef00f007..ee563739023 100644
--- a/admin/tool/behat/tests/behat/nasty_strings.feature
+++ b/admin/tool/behat/tests/behat/nasty_strings.feature
@@ -13,24 +13,24 @@ Feature: Transform steps arguments
     And I open my profile in edit mode
 
   Scenario: Use nasty strings on steps arguments
-    When I set the field "Surname" to "$NASTYSTRING1"
+    When I set the field "Last name" to "$NASTYSTRING1"
     And I set the field "Description" to "$NASTYSTRING2"
     And I set the field "City/town" to "$NASTYSTRING3"
     And I press "Update profile"
     And I click on "Edit profile" "link" in the "region-main" "region"
     Then I should not see "NASTYSTRING"
-    And the field "Surname" matches value "$NASTYSTRING1"
+    And the field "Last name" matches value "$NASTYSTRING1"
     And the field "City/town" matches value "$NASTYSTRING3"
 
   Scenario: Use nasty strings on table nodes
     When I set the following fields to these values:
-      | Surname | $NASTYSTRING1 |
+      | Last name | $NASTYSTRING1 |
       | Description | $NASTYSTRING2 |
       | City/town | $NASTYSTRING3 |
     And I press "Update profile"
     And I click on "Edit profile" "link" in the "region-main" "region"
     Then I should not see "NASTYSTRING"
-    And the field "Surname" matches value "$NASTYSTRING1"
+    And the field "Last name" matches value "$NASTYSTRING1"
     And the field "City/town" matches value "$NASTYSTRING3"
 
   Scenario: Use double quotes
@@ -48,11 +48,11 @@ Feature: Transform steps arguments
   Scenario: Nasty strings with other contents
     When I set the field "First name" to "My Firstname $NASTYSTRING1"
     And I set the following fields to these values:
-      | Surname | My Surname $NASTYSTRING2 |
+      | Last name | My Last name $NASTYSTRING2 |
     And I press "Update profile"
     And I click on "Edit profile" "link" in the "region-main" "region"
     Then I should not see "NASTYSTRING"
     And I should see "My Firstname"
-    And I should see "My Surname"
+    And I should see "My Last name"
     And the field "First name" matches value "My Firstname $NASTYSTRING1"
-    And the field "Surname" matches value "My Surname $NASTYSTRING2"
+    And the field "Last name" matches value "My Last name $NASTYSTRING2"
diff --git a/admin/tool/policy/lang/en/tool_policy.php b/admin/tool/policy/lang/en/tool_policy.php
index 07d81a79c82..001758fd947 100644
--- a/admin/tool/policy/lang/en/tool_policy.php
+++ b/admin/tool/policy/lang/en/tool_policy.php
@@ -98,7 +98,7 @@ $string['nopermissiontoagreedocs'] = 'No permission to agree to the policies';
 $string['nopermissiontoagreedocs_desc'] = 'Sorry, you do not have the required permissions to agree to the policies.<br />You will not be able to use this site until the following policies are agreed:';
 $string['nopermissiontoagreedocsbehalf'] = 'No permission to agree to the policies on behalf of this user';
 $string['nopermissiontoagreedocsbehalf_desc'] = 'Sorry, you do not have the required permission to agree to the following policies on behalf of {$a}:';
-$string['nopermissiontoagreedocscontact'] = 'For further assistance:';
+$string['nopermissiontoagreedocscontact'] = 'For more help:';
 $string['nopermissiontoviewpolicyversion'] = 'You do not have permissions to view this policy version.';
 $string['nopolicies'] = 'There are no policies for registered users with an active version.';
 $string['selectpolicyandversion'] = 'Use the filter above to select policy and/or version';
diff --git a/admin/tool/policy/tests/behat/consent.feature b/admin/tool/policy/tests/behat/consent.feature
index edc4dcc0c88..eb680e9420e 100644
--- a/admin/tool/policy/tests/behat/consent.feature
+++ b/admin/tool/policy/tests/behat/consent.feature
@@ -19,7 +19,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
       | Email address | user1@address.invalid |
       | Email (again) | user1@address.invalid |
       | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
     And I press "Create my new account"
     And I should see "Confirm your account"
     And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -53,7 +53,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
       | Email address | user1@address.invalid |
       | Email (again) | user1@address.invalid |
       | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
     And I press "Create my new account"
     And I should see "Confirm your account"
     And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -98,7 +98,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
       | Email address | user1@address.invalid |
       | Email (again) | user1@address.invalid |
       | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
     And I press "Create my new account"
     And I should see "Confirm your account"
     And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -157,7 +157,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
       | Email address | user1@address.invalid |
       | Email (again) | user1@address.invalid |
       | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
     And I press "Create my new account"
     And I should see "Confirm your account"
     And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -210,7 +210,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
       | Email address | user1@address.invalid |
       | Email (again) | user1@address.invalid |
       | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
     And I press "Create my new account"
     And I should see "Confirm your account"
     And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -522,7 +522,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
       | Email address | user1@address.invalid |
       | Email (again) | user1@address.invalid |
       | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
     When I press "Create my new account"
     Then I should see "Confirm your account"
     And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -647,7 +647,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
       | Email address | user1@address.invalid |
       | Email (again) | user1@address.invalid |
       | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
     And I press "Create my new account"
     And I should see "Confirm your account"
     And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -716,7 +716,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
       | Email address | user1@address.invalid |
       | Email (again) | user1@address.invalid |
       | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
     And I press "Create my new account"
     And I should see "Confirm your account"
     And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -858,7 +858,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
       | Email address | user1@address.invalid |
       | Email (again) | user1@address.invalid |
       | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
     And I press "Create my new account"
     And I should see "Confirm your account"
     And I should see "An email should have been sent to your address at user1@address.invalid"
diff --git a/admin/tool/policy/tests/behat/optional.feature b/admin/tool/policy/tests/behat/optional.feature
index 441519e07d2..374ad922dec 100644
--- a/admin/tool/policy/tests/behat/optional.feature
+++ b/admin/tool/policy/tests/behat/optional.feature
@@ -86,7 +86,7 @@ Feature: Optional policies
       | Email address | user3@address.invalid |
       | Email (again) | user3@address.invalid |
       | First name    | User3                 |
-      | Surname       | L3                    |
+      | Last name       | L3                    |
     And I press "Create my new account"
     And I should see "Confirm your account"
     And I should see "An email should have been sent to your address at user3@address.invalid"
diff --git a/admin/tool/task/lang/en/tool_task.php b/admin/tool/task/lang/en/tool_task.php
index 7089284373a..c7f6c04a653 100644
--- a/admin/tool/task/lang/en/tool_task.php
+++ b/admin/tool/task/lang/en/tool_task.php
@@ -28,7 +28,7 @@ $string['adhoctasks'] = 'Ad hoc tasks';
 $string['asap'] = 'ASAP';
 $string['adhocempty'] = 'Ad hoc task queue is empty';
 $string['adhocqueuesize'] = 'Ad hoc task queue has {$a} tasks';
-$string['adhocqueueold'] = 'Oldest unprocessed task is {$a->age} which is more than {$a->max}';
+$string['adhocqueueold'] = 'Oldest unprocessed task is {$a->age}, which is more than {$a->max}';
 $string['backtoscheduledtasks'] = 'Back to scheduled tasks';
 $string['blocking'] = 'Blocking';
 $string['cannotfindthepathtothecli'] = 'Cannot find the path to the PHP CLI executable so task execution aborted. Set the \'Path to PHP CLI\' setting in Site administration / Server / System paths.';
@@ -37,7 +37,7 @@ $string['checkcronrunning'] = 'Cron running';
 $string['checkmaxfaildelay'] = 'Tasks max fail delay';
 $string['classname'] = 'Class name';
 $string['checklongrunningtasks'] = 'Long running tasks';
-$string['checklongrunningtaskcount'] = 'There are {$a} long running tasks';
+$string['checklongrunningtaskcount'] = 'Long running tasks: {$a}';
 $string['clearfaildelay_confirm'] = 'Are you sure you want to clear the fail delay for task \'{$a}\'? After clearing the delay, the task will run according to its normal schedule.';
 $string['component'] = 'Component';
 $string['corecomponent'] = 'Core';
@@ -73,7 +73,7 @@ $string['scheduledtaskchangesdisabled'] = 'Modifications to the list of schedule
 $string['slowtask'] = 'Task has run for longer than {$a}';
 $string['started'] = 'Started';
 $string['taskage'] = 'Run time';
-$string['taskdetails'] = 'There is {$a->count} task(s) running for more than {$a->time} (max {$a->maxtime})';
+$string['taskdetails'] = 'Tasks running for more than {$a->time} (max {$a->maxtime}): {$a->count}';
 $string['taskdisabled'] = 'Task disabled';
 $string['taskfailures'] = '{$a} task(s) failing';
 $string['tasklogs'] = 'Task logs';
diff --git a/auth/email/tests/behat/signup.feature b/auth/email/tests/behat/signup.feature
index 19c241c3572..297afe7f70f 100644
--- a/auth/email/tests/behat/signup.feature
+++ b/auth/email/tests/behat/signup.feature
@@ -18,7 +18,7 @@ Feature: User must accept policy when logging in and signing up
       | Email address | user1@address.invalid |
       | Email (again) | user1@address.invalid |
       | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
     And I press "Create my new account"
     And I should see "Confirm your account"
     And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -48,7 +48,7 @@ Feature: User must accept policy when logging in and signing up
       | Email address | user1@address.invalid |
       | Email (again) | user1@address.invalid |
       | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
       | I understand and agree | 1            |
     And I press "Create my new account"
     And I should see "Confirm your account"
@@ -81,7 +81,7 @@ Feature: User must accept policy when logging in and signing up
       | Email address | <email1> |
       | Email (again) | <email2> |
       | First name    | Jane    |
-      | Surname       | Doe     |
+      | Last name     | Doe     |
     And I press "Create my new account"
     Then I should <expect> "This email address is already registered. Perhaps you created an account in the past?"
     And I should <expect2> "Invalid email address"
diff --git a/auth/mnet/lang/en/auth_mnet.php b/auth/mnet/lang/en/auth_mnet.php
index 6658c794579..75306144a37 100644
--- a/auth/mnet/lang/en/auth_mnet.php
+++ b/auth/mnet/lang/en/auth_mnet.php
@@ -59,8 +59,8 @@ $string['privacy:metadata:mnet_external:institution'] = 'The institution that th
 $string['privacy:metadata:mnet_external:lang'] = 'A user preference for the language shown.';
 $string['privacy:metadata:mnet_external:lastaccess'] = 'The time that the user last accessed the site.';
 $string['privacy:metadata:mnet_external:lastlogin'] = 'The last login of this user.';
-$string['privacy:metadata:mnet_external:lastname'] = 'The surname of the user.';
-$string['privacy:metadata:mnet_external:lastnamephonetic'] = 'The phonetic details about the user\'s surname.';
+$string['privacy:metadata:mnet_external:lastname'] = 'The last name of the user.';
+$string['privacy:metadata:mnet_external:lastnamephonetic'] = 'The phonetic details of the user\'s last name.';
 $string['privacy:metadata:mnet_external:maildigest'] = 'A setting for the mail digest for this user.';
 $string['privacy:metadata:mnet_external:maildisplay'] = 'A preference for the user about displaying their email address to other users.';
 $string['privacy:metadata:mnet_external:middlename'] = 'The middle name of the user';
diff --git a/cohort/tests/behat/reportbuilder.feature b/cohort/tests/behat/reportbuilder.feature
index 4b89d613b84..6d4bfb2a23c 100644
--- a/cohort/tests/behat/reportbuilder.feature
+++ b/cohort/tests/behat/reportbuilder.feature
@@ -83,15 +83,15 @@ Feature: Manage custom reports for cohorts
       | My report | user:lastname      |
     And I change window size to "large"
     And I am on the "My report" "reportbuilder > Editor" page logged in as "admin"
-    And I set the field "Rename column 'Surname'" to "Member count"
-    And I set the "Surname" column aggregation to "Count"
+    And I set the field "Rename column 'Last name'" to "Member count"
+    And I set the "Last name" column aggregation to "Count"
     And I click on "Show/hide 'Sorting'" "button"
-    And I click on "Move sorting for column 'Surname'" "button"
-    And I click on "To the top of the list" "link" in the "Move sorting for column 'Surname'" "dialogue"
-    And I click on "Enable sorting for column 'Surname'" "checkbox"
+    And I click on "Move sorting for column 'Last name'" "button"
+    And I click on "To the top of the list" "link" in the "Move sorting for column 'Last name'" "dialogue"
+    And I click on "Enable initial sorting for column Last name" "checkbox"
     # "New system cohort" has fewer members than "Another one" cohort.
     And "New system cohort" "table_row" should appear before "Another one" "table_row"
-    When I click on "Sort column 'Surname' descending" "button"
-    Then I should see "Updated sorting for column 'Surname'"
+    When I click on "Sort column 'Last name' descending" "button"
+    Then I should see "Updated sorting for column 'Last name'"
     # Switching sort direction should now show "Another one" cohort ahead of "New system cohort".
     And "Another one" "table_row" should appear before "New system cohort" "table_row"
diff --git a/grade/import/csv/tests/load_data_test.php b/grade/import/csv/tests/load_data_test.php
index 959e92a4a4d..391b8b02e7d 100644
--- a/grade/import/csv/tests/load_data_test.php
+++ b/grade/import/csv/tests/load_data_test.php
@@ -34,17 +34,17 @@ require_once($CFG->libdir . '/grade/tests/fixtures/lib.php');
 class load_data_test extends \grade_base_testcase {
 
     /** @var string $oktext Text to be imported. This data should have no issues being imported. */
-    protected $oktext = '"First name",Surname,"ID number",Institution,Department,"Email address","Assignment: Assignment for grape group", "Feedback: Assignment for grape group","Assignment: Second new grade item","Course total"
+    protected $oktext = '"First name","Last name","ID number",Institution,Department,"Email address","Assignment: Assignment for grape group", "Feedback: Assignment for grape group","Assignment: Second new grade item","Course total"
 Anne,Able,,"Moodle HQ","Rock on!",student7@example.com,56.00,"We welcome feedback",,56.00
 Bobby,Bunce,,"Moodle HQ","Rock on!",student5@example.com,75.00,,45.0,75.00';
 
     /** @var string $badtext Text to be imported. This data has an extra column and should not succeed in being imported. */
-    protected $badtext = '"First name",Surname,"ID number",Institution,Department,"Email address","Assignment: Assignment for grape group","Course total"
+    protected $badtext = '"First name","Last name","ID number",Institution,Department,"Email address","Assignment: Assignment for grape group","Course total"
 Anne,Able,,"Moodle HQ","Rock on!",student7@example.com,56.00,56.00,78.00
 Bobby,Bunce,,"Moodle HQ","Rock on!",student5@example.com,75.00,75.00';
 
     /** @var string $csvtext CSV data to be imported with Last download from this course column. */
-    protected $csvtext = '"First name",Surname,"ID number",Institution,Department,"Email address","Assignment: Assignment for grape group", "Feedback: Assignment for grape group","Course total","Last downloaded from this course"
+    protected $csvtext = '"First name","Last name","ID number",Institution,Department,"Email address","Assignment: Assignment for grape group", "Feedback: Assignment for grape group","Course total","Last downloaded from this course"
 Anne,Able,,"Moodle HQ","Rock on!",student7@example.com,56.00,"We welcome feedback",56.00,{exportdate}
 Bobby,Bunce,,"Moodle HQ","Rock on!",student5@example.com,75.00,,75.00,{exportdate}';
 
@@ -121,7 +121,7 @@ Bobby,Bunce,,"Moodle HQ","Rock on!",student5@example.com,75.00,,75.00,{exportdat
 
         $expectedheaders = array(
             'First name',
-            'Surname',
+            'Last name',
             'ID number',
             'Institution',
             'Department',
diff --git a/grade/report/grader/tests/behat/tertiary_name_filter.feature b/grade/report/grader/tests/behat/tertiary_name_filter.feature
index 2ca502a2bd5..1b36630afc2 100644
--- a/grade/report/grader/tests/behat/tertiary_name_filter.feature
+++ b/grade/report/grader/tests/behat/tertiary_name_filter.feature
@@ -35,7 +35,7 @@ Feature: Within the grader report, test that we can open our generic filter drop
     Given I should see "Filter by name"
     When I press "Filter by name"
     Then I should see "27" node occurrences of type "input" in the "First name" "core_grades > initials bar"
-    And I should see "27" node occurrences of type "input" in the "Surname" "core_grades > initials bar"
+    And I should see "27" node occurrences of type "input" in the "Last name" "core_grades > initials bar"
     And "input[data-action=cancel]" "css_element" should exist
     And "input[data-action=save]" "css_element" should exist
 
@@ -61,7 +61,7 @@ Feature: Within the grader report, test that we can open our generic filter drop
     # Business logic: If all is selected, we will not show it i.e. First (D) and NOT First (D) Last (All)
     And I press "First (D)"
     And I select "All" in the "First name" "core_grades > initials bar"
-    And I select "M" in the "Surname" "core_grades > initials bar"
+    And I select "M" in the "Last name" "core_grades > initials bar"
     And I press "Apply"
     And I wait to be redirected
     # We should only have one user that matches the "T" first name
@@ -79,7 +79,7 @@ Feature: Within the grader report, test that we can open our generic filter drop
     # Test filtering on first && last name
     And I press "Last (M)"
     And I select "U" in the "First name" "core_grades > initials bar"
-    And I select "T" in the "Surname" "core_grades > initials bar"
+    And I select "T" in the "Last name" "core_grades > initials bar"
     And I press "Apply"
     And I wait to be redirected
     # We should only have one user that matches the "T" first name
diff --git a/grade/report/history/tests/behat/basic_functionality.feature b/grade/report/history/tests/behat/basic_functionality.feature
index fd897003c5c..d633f622bad 100644
--- a/grade/report/history/tests/behat/basic_functionality.feature
+++ b/grade/report/history/tests/behat/basic_functionality.feature
@@ -56,7 +56,7 @@ Feature: A teacher checks the grade history report in a course
     And I navigate to "View > Grade history" in the course gradebook
     When I press "Submit"
     Then the following should exist in the "gradereport_history" table:
-      | First name/Surname | Email address        | Favourite food | Grade item                   | Original grade | Revised grade | Grader    |
+      | First name/Last name | Email address        | Favourite food | Grade item                   | Original grade | Revised grade | Grader    |
       | Student 1          | student1@example.com | apple          | The greatest assignment ever |                | 50.00         | Teacher 1 |
       | Student 1          | student1@example.com | apple          | Rewarding assignment         |                | 60.00         | Teacher 1 |
       | Student 2          | student2@example.com | orange         | The greatest assignment ever |                | 50.00         | Teacher 1 |
@@ -84,7 +84,7 @@ Feature: A teacher checks the grade history report in a course
     And I press "Finish selecting users"
     And I press "Submit"
     And the following should exist in the "gradereport_history" table:
-      | First name/Surname | Grade item                    | Original grade | Revised grade | Grader    |
+      | First name/Last name | Grade item                    | Original grade | Revised grade | Grader    |
       | Student 1          | The greatest assignment ever  |                | 50.00         | Teacher 1 |
       | Student 1          | Rewarding assignment          |                | 60.00         | Teacher 1 |
       | Student 1          | The greatest assignment ever  | 50.00          | 70.00         | Teacher 2 |
@@ -101,7 +101,7 @@ Feature: A teacher checks the grade history report in a course
     And I set the field "Grade item" to "The greatest assignment ever"
     And I press "Submit"
     And the following should exist in the "gradereport_history" table:
-      | First name/Surname | Grade item                    | Original grade | Revised grade | Grader    |
+      | First name/Last name | Grade item                    | Original grade | Revised grade | Grader    |
       | Student 1          | The greatest assignment ever  |                | 50.00         | Teacher 1 |
       | Student 1          | The greatest assignment ever  | 50.00          | 70.00         | Teacher 2 |
     And the following should not exist in the "gradereport_history" table:
@@ -111,7 +111,7 @@ Feature: A teacher checks the grade history report in a course
     And I set the field "Grader" to "Teacher 1"
     And I press "Submit"
     And the following should exist in the "gradereport_history" table:
-      | First name/Surname | Email address        | Favourite food | Grade item                    | Original grade | Revised grade | Grader    |
+      | First name/Last name | Email address        | Favourite food | Grade item                    | Original grade | Revised grade | Grader    |
       | Student 1          | student1@example.com | apple          | The greatest assignment ever  |                | 50.00         | Teacher 1 |
     And the following should not exist in the "gradereport_history" table:
       | Student 1          | The greatest assignment ever  | 50.00          | 70.00         | Teacher 2 |
@@ -119,5 +119,5 @@ Feature: A teacher checks the grade history report in a course
     And I click on "id_revisedonly" "checkbox"
     And I press "Submit"
     And the following should exist in the "gradereport_history" table:
-      | First name/Surname | Email address        | Favourite food | Grade item                    | Original grade | Revised grade | Grader    |
+      | First name/Last name | Email address        | Favourite food | Grade item                    | Original grade | Revised grade | Grader    |
       | Student 1          | student1@example.com | apple          | The greatest assignment ever  |                | 50.00         | Teacher 1 |
diff --git a/grade/report/singleview/tests/behat/singleview.feature b/grade/report/singleview/tests/behat/singleview.feature
index 6ca27d149ed..a202ce4d656 100644
--- a/grade/report/singleview/tests/behat/singleview.feature
+++ b/grade/report/singleview/tests/behat/singleview.feature
@@ -93,7 +93,7 @@ Feature: We can use Single view
     And I press "Save"
     Then I should see "Grades were set for 1 items"
     And the following should exist in the "generaltable" table:
-        | First name (Alternate name) Surname | Grade |
+        | First name (Alternate name) Last name | Grade |
         | Ann, Jill, Grainne, Beauchamp | Very good |
     And I log out
     And I log in as "teacher2"
diff --git a/grade/tests/behat/grade_regrade_do_not_override.feature b/grade/tests/behat/grade_regrade_do_not_override.feature
index addd322f951..946919cec58 100644
--- a/grade/tests/behat/grade_regrade_do_not_override.feature
+++ b/grade/tests/behat/grade_regrade_do_not_override.feature
@@ -34,7 +34,7 @@ Feature: Regrading grades does not unnecessarily mark some as overriden
     And I navigate to "View > Grader report" in the course gradebook
     And the following should exist in the "gradereport-grader-table" table:
       |                      |              |              |
-      | First name / Surname | Assignment 1 | Course total |
+      | First name / Last name | Assignment 1 | Course total |
       | Student 1            | 80.00        | 80.00        |
       | Student 2            | 60.00        | 60.00        |
     And I turn editing mode on
@@ -68,6 +68,6 @@ Feature: Regrading grades does not unnecessarily mark some as overriden
     And I navigate to "View > Grader report" in the course gradebook
     Then the following should exist in the "gradereport-grader-table" table:
       |                      |              |              |
-      | First name / Surname | Assignment 1 | Course total |
+      | First name / Last name | Assignment 1 | Course total |
       | Student 1            | 90.00        | 180.00       |
       | Student 2            | 70.00        | 160.00       |
diff --git a/lang/en/admin.php b/lang/en/admin.php
index 1871b913c6d..70e2ad27ba4 100644
--- a/lang/en/admin.php
+++ b/lang/en/admin.php
@@ -40,7 +40,7 @@ $string['adminseesallevents'] = 'Administrators see all events';
 $string['adminseesownevents'] = 'Administrators are just like other users';
 $string['advancedfeatures'] = 'Advanced features';
 $string['agedigitalconsentverification'] = 'Digital age of consent verification';
-$string['agedigitalconsentverification_desc'] = 'Enables verification of the digital age of consent before displaying the sign-up page for self-registration users. This protects your site from minors signing up without parental/guardian consent. <a target="_blank" href="{$a}">Support contact</a> details are provided to minors for further assistance.';
+$string['agedigitalconsentverification_desc'] = 'Enables verification of the digital age of consent before displaying the sign-up page for self-registration users. This protects your site from minors signing up without parental/guardian consent. <a target="_blank" href="{$a}">Support contact</a> details are provided for more help.';
 $string['ageofdigitalconsentmap'] = 'Digital age of consent';
 $string['ageofdigitalconsentmap_desc'] = 'The default digital age of consent, and the age in any country where it differs from the default, may be specified here. Enter each age on a new line with format: country code, age (separated by a comma). The default age is indicated by * in place of the country code. Country codes are as specified in ISO 3166-2.';
 $string['allcountrycodes'] = 'All country codes';
@@ -263,7 +263,7 @@ $string['configfrontpagecourselimithelp'] = 'Maximum number of courses to be dis
 $string['configfrontpageloggedin'] = 'The items selected above will be displayed on the site home when a user is logged in.';
 $string['configfullnamedisplay'] = 'This defines how names are shown when they are displayed in full. The default value, "language", leaves it to the string "fullnamedisplay" in the current language pack to decide. Some languages have different name display conventions.
 
-For most mono-lingual sites the most efficient setting is "firstname lastname", but you may choose to hide surnames altogether. Placeholders that can be used are: firstname, lastname, firstnamephonetic, lastnamephonetic, middlename, and alternatename.';
+For most mono-lingual sites the most efficient setting is "firstname lastname", but you may choose to hide last names altogether. Placeholders that can be used are: firstname, lastname, firstnamephonetic, lastnamephonetic, middlename, and alternatename.';
 $string['configgeoipfile'] = 'Location of GeoLite2 City binary data file. This file is not part of Moodle distribution and must be obtained separately from <a href="https://www.maxmind.com/">MaxMind</a>. You can either buy a commercial version or use the free version. You\'ll need to register to download the City database file, which you can do at <a href="https://dev.maxmind.com/geoip/geoip2/geolite2/" >https://dev.maxmind.com/geoip/geoip2/geolite2/</a>. Once you\'ve registered and downloaded the file, extract it into "{$a}" directory on your server.';
 $string['configgetremoteaddrconf'] = 'If your server is behind a reverse proxy, you can use this setting to specify which HTTP headers can be trusted to contain the remote IP address. The headers are read in order, using the first one that is available.';
 $string['configgradebookroles'] = 'This setting allows you to control who appears on the gradebook.  Users need to have at least one of these roles in a course to be shown in the gradebook for that course.';
diff --git a/lang/en/backup.php b/lang/en/backup.php
index 40a7e45271a..395ca8353bc 100644
--- a/lang/en/backup.php
+++ b/lang/en/backup.php
@@ -310,7 +310,7 @@ $string['restoreactivity'] = 'Restore activity';
 $string['restorecourse'] = 'Restore course';
 $string['restorecoursesettings'] = 'Course settings';
 $string['restoredcourseid'] = 'Restored course ID: {$a}';
-$string['restoreexecutionsuccess'] = 'The course was restored successfully, clicking the continue button below will take you to view the course you restored.';
+$string['restoreexecutionsuccess'] = 'The course was successfully restored.';
 $string['restorefileweremissing'] = 'Some files could not be restored because they were missing in the backup.';
 $string['restorenewcoursefullname'] = 'New course name';
 $string['restorenewcourseshortname'] = 'New course short name';
diff --git a/lang/en/grades.php b/lang/en/grades.php
index 2b8fba1ccda..ee361be2303 100644
--- a/lang/en/grades.php
+++ b/lang/en/grades.php
@@ -184,7 +184,7 @@ $string['encoding'] = 'Encoding';
 $string['encoding_help'] = 'Select the character encoding used for the data. (The standard encoding is UTF-8.) If the wrong encoding is selected by mistake, it will be noticeable when previewing the data for import.';
 $string['errorcalculationnoequal'] = 'Formula must start with equal sign (=1+2)';
 $string['errorcalculationunknown'] = 'Invalid formula';
-$string['errorcalculationbroken'] = 'Probably circular reference or broken calculation formula (Item name: {$a})';
+$string['errorcalculationbroken'] = 'Error in the calculation of grade item {$a}.';
 $string['errorgradevaluenonnumeric'] = 'Received non-numeric for low or high grade for';
 $string['errornocalculationallowed'] = 'Calculations are not allowed for this item';
 $string['errornocategorisedid'] = 'Could not get an uncategorised id!';
diff --git a/lang/en/mnet.php b/lang/en/mnet.php
index ec6791942f1..60bed176885 100644
--- a/lang/en/mnet.php
+++ b/lang/en/mnet.php
@@ -110,7 +110,7 @@ $string['is_in_range'] = 'The IP address <code>{$a}</code> represents a valid tr
 $string['ispublished'] = '{$a} has enabled this service for you.';
 $string['issubscribed'] = '{$a} is subscribing to this service on your host.';
 $string['keydeleted'] = 'Your key has been successfully deleted and replaced.';
-$string['keydeletedcancelled'] = 'The key deletion process has been cancelled.';
+$string['keydeletedcancelled'] = 'No changes made to key.';
 $string['keymismatch'] = 'The public key you are holding for this host is different from the public key it is currently publishing. The currently published key is:';
 $string['last_connect_time'] = 'Last connect time';
 $string['last_connect_time_help'] = 'The time that you last connected to this host.';
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index ea77b5bc0fe..d764cadd162 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -1153,7 +1153,7 @@ $string['indicator:userforumstracking'] = 'User is tracking forums';
 $string['indicator:userforumstracking_help'] = 'This indicator represents whether or not the student has tracking turned on in the forums.';
 $string['info'] = 'Information';
 $string['inprogress'] = 'In progress';
-$string['insertresourceoractivitybefore'] = 'Insert an activity or resource before \'{$a->activityname}\'';
+$string['insertresourceoractivitybefore'] = 'Add an activity or resource before \'{$a->activityname}\'';
 $string['institution'] = 'Institution';
 $string['instudentview'] = 'in student view';
 $string['interests'] = 'Interests';
@@ -1180,8 +1180,8 @@ $string['lastedited'] = 'Last edited';
 $string['lastip'] = 'Last IP address';
 $string['lastlogin'] = 'Last login';
 $string['lastmodified'] = 'Last modified';
-$string['lastname'] = 'Surname';
-$string['lastnamephonetic'] = 'Surname - phonetic';
+$string['lastname'] = 'Last name';
+$string['lastnamephonetic'] = 'Last name - phonetic';
 $string['lastpage'] = 'Last page';
 $string['lastsiteaccess'] = 'Last access to site';
 $string['lastyear'] = 'Last year';
@@ -1319,7 +1319,7 @@ $string['missingemail'] = 'Missing email address';
 $string['missingfirstname'] = 'Missing given name';
 $string['missingfromdisk'] = 'Missing from disk';
 $string['missingfullname'] = 'Missing full name';
-$string['missinglastname'] = 'Missing surname';
+$string['missinglastname'] = 'Missing last name';
 $string['missingname'] = 'Missing name';
 $string['missingnewpassword'] = 'Missing new password';
 $string['missingpassword'] = 'Missing password';
diff --git a/lang/en/reportbuilder.php b/lang/en/reportbuilder.php
index 4a9ac42d130..6736edd2e74 100644
--- a/lang/en/reportbuilder.php
+++ b/lang/en/reportbuilder.php
@@ -65,8 +65,8 @@ $string['columndeleted'] = 'Deleted column \'{$a}\'';
 $string['columnmoved'] = 'Moved column \'{$a}\'';
 $string['columnsortdirectionasc'] = 'Sort column \'{$a}\' ascending';
 $string['columnsortdirectiondesc'] = 'Sort column \'{$a}\' descending';
-$string['columnsortdisable'] = 'Disable sorting for column \'{$a}\'';
-$string['columnsortenable'] = 'Enable sorting for column \'{$a}\'';
+$string['columnsortdisable'] = 'Disable initial sorting for column {$a}';
+$string['columnsortenable'] = 'Enable initial sorting for column {$a}';
 $string['columnsortupdated'] = 'Updated sorting for column \'{$a}\'';
 $string['conditionadded'] = 'Added condition \'{$a}\'';
 $string['conditiondeleted'] = 'Deleted condition \'{$a}\'';
@@ -258,7 +258,7 @@ $string['sendscheduleconfirm'] = 'Are you sure you want to queue the schedule \'
 $string['showhide'] = 'Show/hide \'{$a}\'';
 $string['showhidecard'] = 'Show/hide card';
 $string['sorting'] = 'Sorting';
-$string['sorting_help'] = 'Sorting defines the initial sort order of columns in the report. The order can be reversed by toggling the Up/down icon. Users can then define their own sort order by clicking on a column name.';
+$string['sorting_help'] = 'You can set the initial sort order of columns in the report, which can then be changed by users by clicking on column names.';
 $string['switchedit'] = 'Switch to edit mode';
 $string['switchpreview'] = 'Switch to preview mode';
 $string['tasksendschedule'] = 'Send report schedule';
diff --git a/lang/en/user.php b/lang/en/user.php
index 1513e95485b..0ea92252237 100644
--- a/lang/en/user.php
+++ b/lang/en/user.php
@@ -71,8 +71,8 @@ $string['privacy:metadata:lastaccess'] = 'The time that the user last accessed t
 $string['privacy:metadata:lastaccesstablesummary'] = 'Information about the last time a user accessed a course.';
 $string['privacy:metadata:lastip'] = 'The last IP address for the user.';
 $string['privacy:metadata:lastlogin'] = 'The last login of this user.';
-$string['privacy:metadata:lastname'] = 'The surname of the user.';
-$string['privacy:metadata:lastnamephonetic'] = 'The phonetic details about the user\'s surname.';
+$string['privacy:metadata:lastname'] = 'The last name of the user.';
+$string['privacy:metadata:lastnamephonetic'] = 'The phonetic details of the user\'s last name.';
 $string['privacy:metadata:maildigest'] = 'A setting for the mail digest for this user.';
 $string['privacy:metadata:maildisplay'] = 'A preference for the user about displaying their email address to other users.';
 $string['privacy:metadata:middlename'] = 'The middle name of the user';
diff --git a/lib/tests/behat/alpha_chooser.feature b/lib/tests/behat/alpha_chooser.feature
index 5cb2afde763..7e2784371cb 100644
--- a/lib/tests/behat/alpha_chooser.feature
+++ b/lib/tests/behat/alpha_chooser.feature
@@ -135,7 +135,7 @@ Feature: Initials bar
     And I should see "Astudent Astudent"
     And I should see "Bstudent Astudent"
     And I should see "Cstudent Cstudent"
-    And I select "A" in the "Surname" "core_grades > initials bar"
+    And I select "A" in the "Last name" "core_grades > initials bar"
     And ".initialbarall.page-item.active" "css_element" should exist in the ".initialbar.firstinitial" "css_element"
     And ".initialbarall.page-item.active" "css_element" should not exist in the ".initialbar.lastinitial" "css_element"
     And ".page-item.active.B" "css_element" should not exist in the ".initialbar.firstinitial" "css_element"
@@ -177,7 +177,7 @@ Feature: Initials bar
     And I should see "Bstudent Astudent"
     And I should not see "Cstudent Cstudent"
     And I press "Last (A)"
-    And I select "All" in the "Surname" "core_grades > initials bar"
+    And I select "All" in the "Last name" "core_grades > initials bar"
     And ".initialbarall.page-item.active" "css_element" should exist in the ".initialbar.firstinitial" "css_element"
     And ".initialbarall.page-item.active" "css_element" should exist in the ".initialbar.lastinitial" "css_element"
     And ".page-item.active.B" "css_element" should not exist in the ".initialbar.firstinitial" "css_element"
diff --git a/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php b/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php
index 42d602c6898..3ec2201f921 100644
--- a/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php
+++ b/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php
@@ -181,8 +181,8 @@ $string['config_recordings_preview_default'] = 'Preview is enabled by default';
 $string['config_recordings_preview_default_description'] = 'If enabled the table includes a preview of the presentation.';
 $string['config_recordings_preview_editable'] = 'Preview feature can be edited';
 $string['config_recordings_preview_editable_description'] = 'Preview feature can be edited when the instance is added or updated.';
-$string['config_recordings_asc_sort'] = 'Order the recordings in ascending order.';
-$string['config_recordings_asc_sort_description'] = 'By default recordings are displayed in descending order. When checked they will be sorted in ascending order.';
+$string['config_recordings_asc_sort'] = 'List recordings in chronological order';
+$string['config_recordings_asc_sort_description'] = 'Recordings are ordered by date, either chronological or reverse chronological order.';
 
 $string['config_importrecordings'] = 'Import recordings';
 $string['config_importrecordings_description'] = 'These settings are feature specific.';
@@ -325,14 +325,14 @@ $string['guestaccess_join_meeting'] = 'Join meeting';
 $string['guest_invitation_subject'] = 'Invitation: {$a->name} session in {$a->course_fullname}';
 $string['guest_invitation_small_message'] = 'Hi,
 
-You are invited to a BigBlueButton session {$a->name} in the course  {$a->course_fullname}.
+You are invited to a BigBlueButton session {$a->name} in the course {$a->course_fullname}.
 
 Link: {$a->guestjoinurl}
 Password: {$a->guestpassword}
 
 If you need help, please contact {$a->sender}.';
 $string['guest_invitation_full_message'] = 'Hi,
-<p>You are invited to a BigBlueButton session <strong>{$a->name}</strong> in the course  {$a->course_fullname}.</p>
+<p>You are invited to a BigBlueButton session <strong>{$a->name}</strong> in the course {$a->course_fullname}.</p>
 <p>Link: {$a->guestjoinurl}<br/>
 <p>Password: {$a->guestpassword}</p>
 <p>If you need help, please contact {$a->sender}.</p>';
diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php
index b16aebc9d6d..248d3090708 100644
--- a/mod/forum/lang/en/forum.php
+++ b/mod/forum/lang/en/forum.php
@@ -190,7 +190,7 @@ $string['discussionmoved'] = 'This discussion has been moved to \'{$a}\'.';
 $string['discussionmovedpost'] = 'This discussion has been moved to <a href="{$a->discusshref}">here</a> in the forum <a href="{$a->forumhref}">{$a->forumname}</a>';
 $string['discussionname'] = 'Discussion name';
 $string['discussionnownotsubscribed'] = '{$a->name} will NOT be notified of new posts in \'{$a->discussion}\' of \'{$a->forum}\'';
-$string['discussionnowsubscribed'] = '{$a->name} will be notified of new posts in \'{$a->discussion}\' of \'{$a->forum}\'';
+$string['discussionnowsubscribed'] = 'You will be notified of new posts in \'{$a->discussion}\' in the forum \'{$a->forum}\'.';
 $string['discussionpin'] = 'Pin';
 $string['discussionpinned'] = 'Pinned';
 $string['discussionpinned_help'] = 'Pinned discussions will appear at the top of a forum.';
@@ -491,7 +491,7 @@ $string['nowallsubscribed'] = 'You are now subscribed to all forums in {$a}.';
 $string['nowallunsubscribed'] = 'You are now unsubscribed from all forums in {$a}.';
 $string['nownotsubscribed'] = '{$a->name} will NOT be notified of new posts in \'{$a->forum}\'';
 $string['nownottracking'] = '{$a->name} is no longer tracking \'{$a->forum}\'.';
-$string['nowsubscribed'] = '{$a->name} will be notified of new posts in \'{$a->forum}\'';
+$string['nowsubscribed'] = 'You will be notified of new posts in the forum \'{$a->forum}\'.';
 $string['nowtracking'] = '{$a->name} is now tracking \'{$a->forum}\'.';
 $string['numposts'] = '{$a} posts';
 $string['numberofreplies'] = 'Number of replies: {$a}';
diff --git a/mod/forum/report/summary/tests/behat/course_summary.feature b/mod/forum/report/summary/tests/behat/course_summary.feature
index d2782ee2a61..3698483ef9e 100644
--- a/mod/forum/report/summary/tests/behat/course_summary.feature
+++ b/mod/forum/report/summary/tests/behat/course_summary.feature
@@ -60,12 +60,12 @@ Feature: Course level forum summary report
     And I should see "Export posts"
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |                                 |                                |
-      | First name / Surname | -3-         | -4-     | Earliest post                   | Most recent post               |
+      | First name / Last name | -3-         | -4-     | Earliest post                   | Most recent post               |
       | Student 1            | 1           | 1       | Thursday, 28 March 2019, 11:50  | Thursday, 6 June 2019, 6:40    |
       | Student 2            | 0           | 0       | -                               | -                              |
       | Teacher 1            | 1           | 2       | Wednesday, 27 March 2019, 12:10 | Wednesday, 10 July 2019, 9:30  |
     And the following should not exist in the "forumreport_summary_table" table:
-      | First name / Surname |
+      | First name / Last name |
       | Student 3            |
     And the "Forum selected" select box should contain "All forums in course"
     And the "Forum selected" select box should contain "forum1"
@@ -76,12 +76,12 @@ Feature: Course level forum summary report
     And I should not see "Export posts"
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |                                 |                                  |
-      | First name / Surname | -3-         | -4-     | Earliest post                   | Most recent post                 |
+      | First name / Last name | -3-         | -4-     | Earliest post                   | Most recent post                 |
       | Student 1            | 2           | 3       | Thursday, 25 January 2018, 4:40 | Saturday, 25 January 2020, 11:50 |
       | Student 2            | 0           | 0       | -                               | -                                |
       | Teacher 1            | 4           | 3       | Sunday, 14 January 2018, 9:00   | Thursday, 26 December 2019, 9:30 |
     And the following should not exist in the "forumreport_summary_table" table:
-      | First name / Surname |
+      | First name / Last name |
       | Student 3            |
 
   Scenario: Course forum summary report correctly formats forum activity names
@@ -106,10 +106,10 @@ Feature: Course level forum summary report
     And I navigate to "Reports" in current page administration
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |                                 |                                 |
-      | First name / Surname | -2-         | -3-     | Earliest post                   | Most recent post                |
+      | First name / Last name | -2-         | -3-     | Earliest post                   | Most recent post                |
       | Student 1            | 0           | 1       | Thursday, 25 January 2018, 4:40 | Thursday, 25 January 2018, 4:40 |
     And the following should not exist in the "forumreport_summary_table" table:
-      | First name / Surname |
+      | First name / Last name |
       | Student 2            |
       | Student 3            |
       | Teacher 1            |
@@ -121,10 +121,10 @@ Feature: Course level forum summary report
     Then I select "All forums in course" from the "Forum selected" singleselect
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |                                 |                                  |
-      | First name / Surname | -2-         | -3-     | Earliest post                   | Most recent post                 |
+      | First name / Last name | -2-         | -3-     | Earliest post                   | Most recent post                 |
       | Student 1            | 2           | 3       | Thursday, 25 January 2018, 4:40 | Saturday, 25 January 2020, 11:50 |
     And the following should not exist in the "forumreport_summary_table" table:
-      | First name / Surname |
+      | First name / Last name |
       | Student 2            |
       | Student 3            |
       | Teacher 1            |
diff --git a/mod/forum/report/summary/tests/behat/summary_data_access.feature b/mod/forum/report/summary/tests/behat/summary_data_access.feature
index fcd9397793d..259759d533e 100644
--- a/mod/forum/report/summary/tests/behat/summary_data_access.feature
+++ b/mod/forum/report/summary/tests/behat/summary_data_access.feature
@@ -42,7 +42,7 @@ Feature: Report relevant content availability
       | Teacher 1 | 1   | 0   | 0   | 1   | 2   | 8   |
     And "select-all-users" "checkbox" should be visible
     And "First name" "link" should be visible
-    And "Surname" "link" should be visible
+    And "Last name" "link" should be visible
     And "Number of discussions posted" "link" should be visible
     And "Number of replies posted" "link" should be visible
     And "Number of attachments" "link" should be visible
@@ -74,7 +74,7 @@ Feature: Report relevant content availability
       | Teacher 1 |
     And "select-all-users" "checkbox" should not exist
     And "First name" "link" should be visible
-    And "Surname" "link" should be visible
+    And "Last name" "link" should be visible
     And "Number of discussions posted" "link" should be visible
     And "Number of replies posted" "link" should be visible
     And "Number of attachments" "link" should be visible
diff --git a/mod/forum/report/summary/tests/behat/summary_filter_groups.feature b/mod/forum/report/summary/tests/behat/summary_filter_groups.feature
index 34d1a94decd..ba18bc26557 100644
--- a/mod/forum/report/summary/tests/behat/summary_filter_groups.feature
+++ b/mod/forum/report/summary/tests/behat/summary_filter_groups.feature
@@ -67,7 +67,7 @@ Feature: Groups report filter is available if groups exist
     Then "Groups" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Surname | -3-         | -4-     |
+      | First name / Last name | -3-         | -4-     |
       | Student 1            | 1           | 1       |
       | Student 2            | 0           | 0       |
       | Teacher 1            | 2           | 2       |
@@ -103,7 +103,7 @@ Feature: Groups report filter is available if groups exist
     And "Groups (all)" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Surname | -3-         | -4-     |
+      | First name / Last name | -3-         | -4-     |
       | Student 1            | 1           | 1       |
       | Student 2            | 0           | 0       |
       | Teacher 1            | 2           | 2       |
@@ -115,7 +115,7 @@ Feature: Groups report filter is available if groups exist
     Then "Groups" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Surname | -3-         | -4-     |
+      | First name / Last name | -3-         | -4-     |
       | Student 1            | 1           | 1       |
       | Student 2            | 0           | 0       |
       | Teacher 1            | 2           | 2       |
@@ -128,7 +128,7 @@ Feature: Groups report filter is available if groups exist
     And "Groups (3)" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Surname | -3-         | -4-     |
+      | First name / Last name | -3-         | -4-     |
       | Student 1            | 1           | 1       |
       | Teacher 1            | 1           | 2       |
     And I should not see "Student 2"
@@ -137,7 +137,7 @@ Feature: Groups report filter is available if groups exist
     And "Groups (3)" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Surname | -3-         | -4-     |
+      | First name / Last name | -3-         | -4-     |
       | Student 1            | 1           | 1       |
       | Teacher 1            | 1           | 2       |
     And I should not see "Student 2"
@@ -149,7 +149,7 @@ Feature: Groups report filter is available if groups exist
     Then "Groups" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Surname | -3-         | -4-     |
+      | First name / Last name | -3-         | -4-     |
       | Student 1            | 0           | 0       |
       | Student 2            | 1           | 2       |
       | Teacher 1            | 3           | 1       |
@@ -161,7 +161,7 @@ Feature: Groups report filter is available if groups exist
     And "Groups (2)" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Surname | -3-         | -4-     |
+      | First name / Last name | -3-         | -4-     |
       | Student 1            | 0           | 0       |
       | Student 2            | 1           | 1       |
       | Teacher 1            | 2           | 1       |
@@ -172,7 +172,7 @@ Feature: Groups report filter is available if groups exist
     And I navigate to "Reports" in current page administration
     Then the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Surname | -3-         | -4-     |
+      | First name / Last name | -3-         | -4-     |
       | Student 1            | 0           | 0       |
       | Student 2            | 1           | 2       |
       | Teacher 1            | 3           | 1       |
@@ -183,7 +183,7 @@ Feature: Groups report filter is available if groups exist
     And "Groups (1)" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Surname | -3-         | -4-     |
+      | First name / Last name | -3-         | -4-     |
       | Student 1            | 0           | 0       |
       | Student 2            | 1           | 1       |
       | Teacher 1            | 1           | 0       |
@@ -196,7 +196,7 @@ Feature: Groups report filter is available if groups exist
     Then "Groups" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Surname | -3-         | -4-     |
+      | First name / Last name | -3-         | -4-     |
       | Student 1            | 1           | 1       |
       | Student 2            | 0           | 0       |
       | Teacher 1            | 2           | 2       |
@@ -225,7 +225,7 @@ Feature: Groups report filter is available if groups exist
     And "Groups (2)" "button" should exist
     Then the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Surname | -3-         | -4-     |
+      | First name / Last name | -3-         | -4-     |
       | Student 1            | 1           | 1       |
       | Teacher 1            | 2           | 3       |
     And I should not see "Student 2"
@@ -234,7 +234,7 @@ Feature: Groups report filter is available if groups exist
     And "Groups (2)" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Surname | -3-         | -4-     |
+      | First name / Last name | -3-         | -4-     |
       | Student 1            | 1           | 1       |
       | Teacher 1            | 2           | 3       |
     And I should not see "Student 2"
diff --git a/mod/forum/report/summary/tests/behat/summary_filter_no_groups.feature b/mod/forum/report/summary/tests/behat/summary_filter_no_groups.feature
index ec81545e3ce..d316fc6f5e5 100644
--- a/mod/forum/report/summary/tests/behat/summary_filter_no_groups.feature
+++ b/mod/forum/report/summary/tests/behat/summary_filter_no_groups.feature
@@ -54,7 +54,7 @@ Feature: Groups report filter is not available if no groups exist
     Then "Groups" "button" should not exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions |
-      | First name / Surname | -3-         |
+      | First name / Last name | -3-         |
       | Teacher 1            | 2           |
       | Student 1            | 1           |
       | Student 2            | 0           |
diff --git a/mod/forum/tests/behat/discussion_subscriptions.feature b/mod/forum/tests/behat/discussion_subscriptions.feature
index df82afa2858..f00eac2ff2d 100644
--- a/mod/forum/tests/behat/discussion_subscriptions.feature
+++ b/mod/forum/tests/behat/discussion_subscriptions.feature
@@ -51,7 +51,7 @@ Feature: A user can control their own subscription preferences for a discussion
     And "Unsubscribe from this discussion" "checkbox" should exist in the "Test post subject one" "table_row"
     And "Subscribe to this discussion" "checkbox" should exist in the "Test post subject two" "table_row"
     And I follow "Subscribe to forum"
-    And I should see "Student One will be notified of new posts in 'Test forum name'"
+    And I should see "You will be notified of new posts in the forum 'Test forum name'"
     And I can unsubscribe from this forum
     And "Unsubscribe from this discussion" "checkbox" should exist in the "Test post subject one" "table_row"
     And "Unsubscribe from this discussion" "checkbox" should exist in the "Test post subject two" "table_row"
@@ -101,7 +101,7 @@ Feature: A user can control their own subscription preferences for a discussion
     And "Subscribe to this discussion" "checkbox" should exist in the "Test post subject one" "table_row"
     And "Subscribe to this discussion" "checkbox" should exist in the "Test post subject two" "table_row"
     And I subscribe to this forum
-    And I should see "Student One will be notified of new posts in 'Test forum name'"
+    And I should see "You will be notified of new posts in the forum 'Test forum name'"
     And I can unsubscribe from this forum
     And "Unsubscribe from this discussion" "checkbox" should exist in the "Test post subject one" "table_row"
     And "Unsubscribe from this discussion" "checkbox" should exist in the "Test post subject two" "table_row"
@@ -287,7 +287,7 @@ Feature: A user can control their own subscription preferences for a discussion
     And "You are not subscribed to this discussion. Click to subscribe" "link" should exist
     And I follow "Test forum name"
     And I follow "Subscribe to forum"
-    And I should see "Student One will be notified of new posts in 'Test forum name'"
+    And I should see "You will be notified of new posts in the forum 'Test forum name'"
     And "Unsubscribe from forum" "link" should exist
     And I follow "Test post subject one"
     And "You are subscribed to this discussion. Click to unsubscribe" "link" should exist
@@ -302,10 +302,10 @@ Feature: A user can control their own subscription preferences for a discussion
     And I follow "Test post subject one"
     And "You are not subscribed to this discussion. Click to subscribe" "link" should exist
     And I follow "You are not subscribed to this discussion. Click to subscribe"
-    And I should see "Student One will be notified of new posts in 'Test post subject one' of 'Test forum name'"
+    And I should see "You will be notified of new posts in 'Test post subject one' in the forum 'Test forum name'."
     And "Unsubscribe from this discussion" "checkbox" should exist in the "Test post subject one" "table_row"
     And I follow "Subscribe to forum"
-    And I should see "Student One will be notified of new posts in 'Test forum name'"
+    And I should see "You will be notified of new posts in the forum 'Test forum name'"
     And "Unsubscribe from forum" "link" should exist
     And I follow "Test post subject one"
     And "You are subscribed to this discussion. Click to unsubscribe" "link" should exist
diff --git a/mod/forum/tests/behat/forum_subscriptions.feature b/mod/forum/tests/behat/forum_subscriptions.feature
index 4f360e6b948..9b81d6b841e 100644
--- a/mod/forum/tests/behat/forum_subscriptions.feature
+++ b/mod/forum/tests/behat/forum_subscriptions.feature
@@ -95,7 +95,7 @@ Feature: A user can control their own subscription preferences for a forum
     Then I should see "Subscribe to forum"
     And I should not see "Unsubscribe from forum"
     And I follow "Subscribe to forum"
-    And I should see "Student One will be notified of new posts in 'Test forum name'"
+    And I should see "You will be notified of new posts in the forum 'Test forum name'"
     And I should see "Unsubscribe from forum"
     And I should not see "Subscribe to forum"
 
diff --git a/mod/glossary/lang/en/glossary.php b/mod/glossary/lang/en/glossary.php
index 21765a3f94d..00fd02f5d2e 100644
--- a/mod/glossary/lang/en/glossary.php
+++ b/mod/glossary/lang/en/glossary.php
@@ -166,7 +166,7 @@ $string['errconceptalreadyexists'] = 'This concept already exists. No duplicates
 $string['errdeltimeexpired'] = 'You can\'t delete this. Time expired!';
 $string['erredittimeexpired'] = 'The editing time for this entry has expired.';
 $string['errorparsingxml'] = 'Errors occurred while parsing the file. Make sure it is valid XML syntax.';
-$string['errreservedkeywords'] = 'Some/All of the entered keywords cannot be used as they are reserved.';
+$string['errreservedkeywords'] = 'One or more keywords contain a special character which cannot be used.';
 $string['eventcategorycreated'] = 'Category has been created';
 $string['eventcategorydeleted'] = 'Category has been deleted';
 $string['eventcategoryupdated'] = 'Category has been updated';
diff --git a/mod/glossary/tests/behat/create_entry.feature b/mod/glossary/tests/behat/create_entry.feature
index 9e3e71eb8c1..83dc4f2798c 100644
--- a/mod/glossary/tests/behat/create_entry.feature
+++ b/mod/glossary/tests/behat/create_entry.feature
@@ -29,4 +29,4 @@ Feature: Create a glossary entry.
       | Definition | Dream is the start of a journey |
       | Keyword(s) | "                               |
     And I press "Save changes"
-    Then I should see "Some/All of the entered keywords cannot be used as they are reserved."
+    Then I should see "One or more keywords contain a special character which cannot be used."
diff --git a/mod/lesson/lang/en/lesson.php b/mod/lesson/lang/en/lesson.php
index 4f653781032..9835843fe03 100644
--- a/mod/lesson/lang/en/lesson.php
+++ b/mod/lesson/lang/en/lesson.php
@@ -196,9 +196,9 @@ $string['editquestion'] = 'Editing a question page';
 $string['editshortanswer'] = 'Editing a Short answer question page';
 $string['edittruefalse'] = 'Editing a True/false question page';
 $string['email'] = 'Email';
-$string['emailallgradedessays'] = 'Email ALL graded essays';
-$string['emailgradedessays'] = 'Email graded essays';
-$string['emailsuccess'] = 'Emails sent successfully';
+$string['emailallgradedessays'] = 'Send essay graded notifications';
+$string['emailgradedessays'] = 'Send essay graded notifications';
+$string['emailsuccess'] = 'Notifications sent successfully';
 $string['enabled'] = 'Enabled';
 $string['endofbranch'] = 'End of branch';
 $string['endofcluster'] = 'End of cluster';
diff --git a/mod/quiz/accessrule/seb/lang/en/quizaccess_seb.php b/mod/quiz/accessrule/seb/lang/en/quizaccess_seb.php
index 1a8f5beb668..c2b478343a7 100644
--- a/mod/quiz/accessrule/seb/lang/en/quizaccess_seb.php
+++ b/mod/quiz/accessrule/seb/lang/en/quizaccess_seb.php
@@ -48,7 +48,7 @@ $string['downloadsebconfig'] = 'Download SEB config file';
 $string['duplicatetemplate'] = 'A template with the same name already exists.';
 $string['edittemplate'] = 'Edit template';
 $string['enabled'] = 'Enabled';
-$string['error:ws:nokeyprovided'] = 'At least one SEB key must be provided.';
+$string['error:ws:nokeyprovided'] = 'At least one Safe Exam Browser key must be provided.';
 $string['error:ws:quiznotexists'] = 'Quiz not found matching course module ID: {$a}';
 $string['event:accessprevented'] = "Quiz access was prevented";
 $string['event:templatecreated'] = 'SEB template was created';
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 727c8076822..b9c5b3b9a14 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
@@ -136,7 +136,7 @@ class validate_quiz_access_test extends \advanced_testcase {
      */
     public function test_no_keys_provided() {
         $this->expectException(\invalid_parameter_exception::class);
-        $this->expectExceptionMessage('At least one SEB key must be provided.');
+        $this->expectExceptionMessage('At least one Safe Exam Browser key must be provided.');
         validate_quiz_keys::execute($this->quiz->cmid, 'https://www.example.com/moodle');
     }
 
diff --git a/mod/quiz/lang/en/quiz.php b/mod/quiz/lang/en/quiz.php
index c2757f32e9b..17ff0bdf333 100644
--- a/mod/quiz/lang/en/quiz.php
+++ b/mod/quiz/lang/en/quiz.php
@@ -284,7 +284,7 @@ $string['dragtostart'] = 'To the start';
 $string['duplicateresponse'] = 'This submission has been ignored because you gave an equivalent answer earlier.';
 $string['eachattemptbuildsonthelast'] = 'Each attempt builds on the last';
 $string['eachattemptbuildsonthelast_help'] = 'If multiple attempts are allowed and this setting is enabled, each new quiz attempt will contain the results of the previous attempt. This allows a quiz to be completed over several attempts.';
-$string['edit_slotdisplaynumber_hint'] = 'Edit question number (max 16 characters), long strings are truncated.';
+$string['edit_slotdisplaynumber_hint'] = 'Edit question number (maximum 16 characters)';
 $string['edit_slotdisplaynumber_label'] = 'New value for {$a}';
 $string['editcategories'] = 'Edit categories';
 $string['editcategory'] = 'Edit category';
diff --git a/mod/workshop/tests/behat/workshop_activity_filter.feature b/mod/workshop/tests/behat/workshop_activity_filter.feature
index 05897fc9fd7..e595a16cac0 100644
--- a/mod/workshop/tests/behat/workshop_activity_filter.feature
+++ b/mod/workshop/tests/behat/workshop_activity_filter.feature
@@ -21,7 +21,7 @@ Feature: View work shop activity submissions report.
       | activity | name          | intro                     | course |
       | workshop | Music history | Test workshop description | C1     |
 
-  Scenario Outline: Filter submissions report by surname/first name
+  Scenario Outline: Filter submissions report by last name/first name
     Given I am on the "Music history" "workshop activity" page logged in as teacher1
     When I change phase in workshop "Music history" to "<phase>"
     Then ".firstinitial" "css_element" should exist
@@ -38,7 +38,7 @@ Feature: View work shop activity submissions report.
       | Grading evaluation phase |
       | Closed                   |
 
-  Scenario: Filter submissions report by surname/first name is hidden in the Setup phase.
+  Scenario: Filter submissions report by last name/first name is hidden in the Setup phase.
     When I am on the "Music history" "workshop activity" page logged in as teacher1
     Then ".firstinitial" "css_element" should not exist
     And ".lastinitial" "css_element" should not exist
@@ -52,7 +52,7 @@ Feature: View work shop activity submissions report.
     And I should see "Beth Velvet" in the "grading-report" "table"
     And I should not see "Vinnie Money" in the "grading-report" "table"
 
-  Scenario: Filter submissions report by surname name as a teacher.
+  Scenario: Filter submissions report by last name name as a teacher.
     Given I am on the "Music history" "workshop activity" page logged in as teacher1
     And I change phase in workshop "Music history" to "Submission phase"
     When I click on "V" "link" in the ".lastinitial" "css_element"
@@ -60,7 +60,7 @@ Feature: View work shop activity submissions report.
     And I should not see "Beth Moe" in the "grading-report" "table"
     And I should not see "Vinnie Money" in the "grading-report" "table"
 
-  Scenario: Filter submissions report by first name and surname as a teacher.
+  Scenario: Filter submissions report by first name and last name as a teacher.
     Given I am on the "Music history" "workshop activity" page logged in as teacher1
     And I change phase in workshop "Music history" to "Submission phase"
     When I click on "V" "link" in the ".firstinitial" "css_element"
diff --git a/report/configlog/lang/en/report_configlog.php b/report/configlog/lang/en/report_configlog.php
index 4c0b94add46..923ecf61b90 100644
--- a/report/configlog/lang/en/report_configlog.php
+++ b/report/configlog/lang/en/report_configlog.php
@@ -33,7 +33,7 @@ $string['setting'] = 'Setting';
 $string['timemodified'] = 'Date';
 $string['user'] = 'User';
 $string['usernone'] = 'CLI or install';
-$string['user_help'] = 'Search by user first name or surname';
+$string['user_help'] = 'Search by user first name or last name';
 $string['value'] = 'Value';
 $string['value_help'] = 'Search by new or original value of the configuration';
 $string['valuenew'] = 'New value';
diff --git a/report/progress/lang/en/report_progress.php b/report/progress/lang/en/report_progress.php
index 69bf60dc8b0..a9028edde6e 100644
--- a/report/progress/lang/en/report_progress.php
+++ b/report/progress/lang/en/report_progress.php
@@ -25,7 +25,7 @@
 
 $string['pluginname'] = 'Activity completion';
 $string['activityorder'] = 'Activity order';
-$string['activitysection'] = 'Activity section';
+$string['activitysection'] = 'Section';
 $string['allactivitiesandresources'] = 'All activities and resources';
 $string['alphabetical'] = 'Alphabetical ';
 $string['include'] = 'Include';
diff --git a/report/progress/tests/behat/activity_completion_report_filter.feature b/report/progress/tests/behat/activity_completion_report_filter.feature
index 70fdb7cee72..1be737c2d56 100644
--- a/report/progress/tests/behat/activity_completion_report_filter.feature
+++ b/report/progress/tests/behat/activity_completion_report_filter.feature
@@ -53,7 +53,7 @@ Feature: Teacher can view and filter activity completion data by group, activity
     And I should not see "Student Two" in the "completion-progress" "table"
     And I set the field "Separate groups" to "All participants"
     And I set the field "Include" to "All activities and resources"
-    And I set the field "Activity section" to "Topic 1"
+    And I set the field "Section" to "Topic 1"
     And I should not see "My assignment" in the "completion-progress" "table"
     And I should not see "My page" in the "completion-progress" "table"
     And I should not see "My assignment" in the "completion-progress" "table"
@@ -61,10 +61,10 @@ Feature: Teacher can view and filter activity completion data by group, activity
     And I should see "My quiz A" in the "completion-progress" "table"
     And I should see "Quiz" in the "activityinclude" "select"
     And I should not see "Page" in the "activityinclude" "select"
-    And I set the field "Activity section" to "Topic 2"
+    And I set the field "Section" to "Topic 2"
     And I should not see "Quiz" in the "activityinclude" "select"
     And I should see "Page" in the "activityinclude" "select"
     And I should see "Assignment" in the "activityinclude" "select"
     And I set the field "Include" to "Page"
-    And I set the field "Activity section" to "Topic 1"
+    And I set the field "Section" to "Topic 1"
     And I should see "Page" in the "activityinclude" "select"
diff --git a/reportbuilder/tests/behat/columneditor.feature b/reportbuilder/tests/behat/columneditor.feature
index 72671d738b0..82fb7bc31e4 100644
--- a/reportbuilder/tests/behat/columneditor.feature
+++ b/reportbuilder/tests/behat/columneditor.feature
@@ -19,12 +19,12 @@ Feature: Manage custom report columns
       | source  | core_user\reportbuilder\datasource\users |
       | default | 0                                        |
     And I am on the "My report" "reportbuilder > Editor" page logged in as "admin"
-    When I set the field "Search" in the "[data-region=sidebar-menu]" "css_element" to "Surname"
-    Then I should see "Surname" in the "[data-region=sidebar-menu]" "css_element"
+    When I set the field "Search" in the "[data-region=sidebar-menu]" "css_element" to "Last name"
+    Then I should see "Last name" in the "[data-region=sidebar-menu]" "css_element"
     And I should not see "Email address" in the "[data-region=sidebar-menu]" "css_element"
-    And I click on "Add column 'Surname'" "link"
-    And I should see "Added column 'Surname'"
-    And I should see "Surname" in the "reportbuilder-table" "table"
+    And I click on "Add column 'Last name'" "link"
+    And I should see "Added column 'Last name'"
+    And I should see "Last name" in the "reportbuilder-table" "table"
 
   Scenario: Rename column in report
     Given the following "core_reportbuilder > Report" exists:
diff --git a/reportbuilder/tests/behat/columnsortingeditor.feature b/reportbuilder/tests/behat/columnsortingeditor.feature
index 1c64a7342d1..a2b9644b276 100644
--- a/reportbuilder/tests/behat/columnsortingeditor.feature
+++ b/reportbuilder/tests/behat/columnsortingeditor.feature
@@ -24,41 +24,41 @@ Feature: Manage custom report columns sorting
     Given I change window size to "large"
     And I click on "Show/hide 'Sorting'" "button"
     # This will be the fallback sort after toggling lastname sorting.
-    And I click on "Enable sorting for column 'First name'" "checkbox"
-    When I click on "Enable sorting for column 'Surname'" "checkbox"
-    Then I should see "Updated sorting for column 'Surname'"
+    And I click on "Enable initial sorting for column First name" "checkbox"
+    When I click on "Enable initial sorting for column Last name" "checkbox"
+    Then I should see "Updated sorting for column 'Last name'"
     And "user02" "table_row" should appear before "user01" "table_row"
-    And I click on "Disable sorting for column 'Surname'" "checkbox"
-    And I should see "Updated sorting for column 'Surname'"
+    And I click on "Disable initial sorting for column Last name" "checkbox"
+    And I should see "Updated sorting for column 'Last name'"
     And "user01" "table_row" should appear before "user02" "table_row"
 
   Scenario: Change column sort direction in report
     Given I change window size to "large"
     And I click on "Show/hide 'Sorting'" "button"
-    When I click on "Enable sorting for column 'Surname'" "checkbox"
-    And I click on "Sort column 'Surname' descending" "button"
-    Then I should see "Updated sorting for column 'Surname'"
+    When I click on "Enable initial sorting for column Last name" "checkbox"
+    And I click on "Sort column 'Last name' descending" "button"
+    Then I should see "Updated sorting for column 'Last name'"
     And "user01" "table_row" should appear before "user02" "table_row"
-    And I click on "Sort column 'Surname' ascending" "button"
-    And I should see "Updated sorting for column 'Surname'"
+    And I click on "Sort column 'Last name' ascending" "button"
+    And I should see "Updated sorting for column 'Last name'"
     And "user02" "table_row" should appear before "user01" "table_row"
 
   Scenario: Change column sort order in report
     Given I change window size to "large"
     And I click on "Show/hide 'Sorting'" "button"
-    When I click on "Enable sorting for column 'Surname'" "checkbox"
-    And I click on "Enable sorting for column 'First name'" "checkbox"
+    When I click on "Enable initial sorting for column Last name" "checkbox"
+    And I click on "Enable initial sorting for column First name" "checkbox"
     And I click on "Move sorting for column 'First name'" "button"
     And I click on "To the top of the list" "link" in the "Move sorting for column 'First name'" "dialogue"
     Then I should see "Updated sorting for column 'First name'"
-    And "First name" "text" should appear before "Surname" "text" in the "#settingssorting" "css_element"
+    And "First name" "text" should appear before "Last name" "text" in the "#settingssorting" "css_element"
     And "user01" "table_row" should appear before "user02" "table_row"
 
   Scenario: Change column sorting for column sorted by multiple fields
     Given I change window size to "large"
     And I click on "Add column 'Full name'" "link"
     And I click on "Show/hide 'Sorting'" "button"
-    When I click on "Enable sorting for column 'Full name'" "checkbox"
+    When I click on "Enable initial sorting for column Full name" "checkbox"
     Then I should see "Updated sorting for column 'Full name'"
     # User1 = Alice Zebra; User2=Zoe Aardvark; User3 = Alice Badger.
     And "user03" "table_row" should appear before "user01" "table_row"
@@ -72,7 +72,7 @@ Feature: Manage custom report columns sorting
     Given I change window size to "large"
     And I click on "Show/hide 'Sorting'" "button"
     # Sort by last name descending.
-    When I click on "Enable sorting for column 'Surname'" "checkbox"
+    When I click on "Enable initial sorting for column Last name" "checkbox"
     Then "user02" "table_row" should appear before "user01" "table_row"
     # Switching to preview mode should observe report config.
     And I click on "Switch to preview mode" "button"
diff --git a/reportbuilder/tests/behat/customreports.feature b/reportbuilder/tests/behat/customreports.feature
index 434f4b16c01..76611fc62a8 100644
--- a/reportbuilder/tests/behat/customreports.feature
+++ b/reportbuilder/tests/behat/customreports.feature
@@ -26,7 +26,7 @@ Feature: Manage custom reports
     # Confirm we see the default sorting in the report
     And "Admin User" "table_row" should appear before "User 2" "table_row"
     And I click on "Show/hide 'Sorting'" "button"
-    And "Disable sorting for column 'Full name'" "checkbox" should exist in the "#settingssorting" "css_element"
+    And "Disable initial sorting for column Full name" "checkbox" should exist in the "#settingssorting" "css_element"
     And I click on "Show/hide 'Sorting'" "button"
     # Confirm we only see not suspended users in the report.
     And I should see "Admin User" in the "reportbuilder-table" "table"
diff --git a/reportbuilder/tests/external/custom_report_columns_sorting_exporter_test.php b/reportbuilder/tests/external/custom_report_columns_sorting_exporter_test.php
index baadf120c74..afdb640ac21 100644
--- a/reportbuilder/tests/external/custom_report_columns_sorting_exporter_test.php
+++ b/reportbuilder/tests/external/custom_report_columns_sorting_exporter_test.php
@@ -69,7 +69,7 @@ class custom_report_columns_sorting_exporter_test extends advanced_testcase {
         $this->assertTrue($sortcolumnemail['sortenabled']);
         $this->assertEquals(1, $sortcolumnemail['sortorder']);
         $this->assertEquals(SORT_DESC, $sortcolumnemail['sortdirection']);
-        $this->assertEquals('Disable sorting for column \'Email address\'', $sortcolumnemail['sortenabledtitle']);
+        $this->assertEquals('Disable initial sorting for column Email address', $sortcolumnemail['sortenabledtitle']);
         $this->assertEquals('Sort column \'Email address\' ascending', $sortcolumnemail['sorticon']['title']);
 
         // Fullname column.
@@ -78,7 +78,7 @@ class custom_report_columns_sorting_exporter_test extends advanced_testcase {
         $this->assertFalse($sortcolumnfullname['sortenabled']);
         $this->assertEquals(2, $sortcolumnfullname['sortorder']);
         $this->assertEquals(SORT_ASC, $sortcolumnfullname['sortdirection']);
-        $this->assertEquals('Enable sorting for column \'Full name\'', $sortcolumnfullname['sortenabledtitle']);
+        $this->assertEquals('Enable initial sorting for column Full name', $sortcolumnfullname['sortenabledtitle']);
         $this->assertEquals('Sort column \'Full name\' descending', $sortcolumnfullname['sorticon']['title']);
 
         $this->assertNotEmpty($export->helpicon);
diff --git a/search/tests/behat/search_by_user.feature b/search/tests/behat/search_by_user.feature
index 5a724a49173..d34409a8245 100644
--- a/search/tests/behat/search_by_user.feature
+++ b/search/tests/behat/search_by_user.feature
@@ -36,7 +36,7 @@ Feature: Select users when searching for user-created content
     And I search for "frogs" using the header global search box
     And I expand all fieldsets
     When I expand the "Users" autocomplete
-    # Alphabetical surname order.
+    # Alphabetical last name order.
     Then "Anne Additional" "text" should appear before "Anne Ditin" "text" in the "Users" "autocomplete"
     And "Anne Ditin" "text" should appear before "Anne Other" "text" in the "Users" "autocomplete"
 
diff --git a/user/tests/behat/edit_profile_notification.feature b/user/tests/behat/edit_profile_notification.feature
index 2ae266c7751..22306f3bc0d 100644
--- a/user/tests/behat/edit_profile_notification.feature
+++ b/user/tests/behat/edit_profile_notification.feature
@@ -22,7 +22,7 @@ Feature: Notification shown when user edit profile or preferences
     When I click on "Edit profile" "link" in the "region-main" "region"
     And I should see "Unicorn"
     And I should see "1"
-    Then I set the field "Surname" to "Lil"
+    Then I set the field "Last name" to "Lil"
     And I click on "Update profile" "button"
     And I should see "Changes saved"
     And I press "Dismiss this notification"
@@ -43,7 +43,7 @@ Feature: Notification shown when user edit profile or preferences
     When I click on "Edit profile" "link" in the "region-main" "region"
     And I should see "Unicorn"
     And I should see "1"
-    Then I set the field "Surname" to "Lil"
+    Then I set the field "Last name" to "Lil"
     And I click on "Cancel" "button"
     And I should not see "Changes saved"
 
@@ -53,6 +53,6 @@ Feature: Notification shown when user edit profile or preferences
     And I navigate to "Users > Accounts > Browse list of users" in site administration
     When I click on "Edit" "link" in the "Unicorn 1" "table_row"
     And I expand all fieldsets
-    Then I set the field "Surname" to "Lil"
+    Then I set the field "Last name" to "Lil"
     And I click on "Update profile" "button"
     And I should see "Changes saved"
diff --git a/user/tests/behat/filter_participants.feature b/user/tests/behat/filter_participants.feature
index ea9aa6dd5ef..4980eaa792f 100644
--- a/user/tests/behat/filter_participants.feature
+++ b/user/tests/behat/filter_participants.feature
@@ -617,7 +617,7 @@ Feature: Course participants can be filtered
     And I should see "Student 4" in the "participants" "table"
     And I should not see "Patricia Pea" in the "participants" "table"
 
-    When I click on "Surname" "link"
+    When I click on "Last name" "link"
     Then I should see "Student 1" in the "participants" "table"
     And I should see "Student 2" in the "participants" "table"
     And I should see "Student 3" in the "participants" "table"
diff --git a/user/tests/behat/input-purpose.feature b/user/tests/behat/input-purpose.feature
index f466f65e5a0..4ffd5ddf4ba 100644
--- a/user/tests/behat/input-purpose.feature
+++ b/user/tests/behat/input-purpose.feature
@@ -20,7 +20,7 @@ Feature: The purpose of each input field collecting information about the user c
     And I expand all fieldsets
     Then the field "Username" should not have purpose "username"
     And the field "First name" should not have purpose "given-name"
-    And the field "Surname" should not have purpose "family-name"
+    And the field "Last name" should not have purpose "family-name"
     And the field "Email" should not have purpose "email"
     And the field "Select a country" should not have purpose "country"
     And I press "Cancel"
@@ -34,7 +34,7 @@ Feature: The purpose of each input field collecting information about the user c
     And I click on "Edit profile" "link" in the "region-main" "region"
     And I expand all fieldsets
     Then the field "First name" should have purpose "given-name"
-    And the field "Surname" should have purpose "family-name"
+    And the field "Last name" should have purpose "family-name"
     And the field "Email" should have purpose "email"
     And the field "Select a country" should have purpose "country"
     And I press "Cancel"
diff --git a/user/tests/behat/name_fields.feature b/user/tests/behat/name_fields.feature
index 78242878ce1..6df4e85280f 100644
--- a/user/tests/behat/name_fields.feature
+++ b/user/tests/behat/name_fields.feature
@@ -1,8 +1,8 @@
 @core @core_user
-Feature: Both first name and surname are always available for every user
+Feature: Both first name and last name are always available for every user
   In order to easily identify and display users on Moodle pages
   As any user
-  I need to rely on both first name and surname are always available
+  I need to rely on both first name and last name are always available
 
   Scenario: Attempting to self-register as a new user with empty names
     Given the following config values are set as admin:
@@ -17,10 +17,10 @@ Feature: Both first name and surname are always available for every user
       | Email address | mrwhitespace@nas.ty |
       | Email (again) | mrwhitespace@nas.ty |
     And I set the field "First name" to " "
-    And I set the field "Surname" to " "
+    And I set the field "Last name" to " "
     And I press "Create my new account"
     Then I should see "Missing given name"
-    And I should see "Missing surname"
+    And I should see "Missing last name"
 
   Scenario: Attempting to change own names to whitespace
     Given the following "users" exist:
@@ -34,17 +34,17 @@ Feature: Both first name and surname are always available for every user
     And I click on "Edit profile" "link" in the "region-main" "region"
     # End UI test covering "I open my profile in edit mode"
     When I set the field "First name" to " "
-    And I set the field "Surname" to " "
+    And I set the field "Last name" to " "
     And I click on "Cancel" "button"
     And I follow "Profile" in the user menu
     And I click on "Edit profile" "link" in the "region-main" "region"
     Then I should see "Foo"
     And I should see "Bar"
     When I set the field "First name" to " "
-    And I set the field "Surname" to " "
+    And I set the field "Last name" to " "
     And I click on "Update profile" "button"
     Then I should see "Missing given name"
-    And I should see "Missing surname"
+    And I should see "Missing last name"
 
   Scenario: Attempting to change someone else's names to whitespace
     Given the following "users" exist:
@@ -55,14 +55,14 @@ Feature: Both first name and surname are always available for every user
     And I follow "Foo Bar"
     And I click on "Edit profile" "link" in the "region-main" "region"
     When I set the field "First name" to " "
-    And I set the field "Surname" to " "
+    And I set the field "Last name" to " "
     And I click on "Cancel" "button"
     And I follow "Foo Bar"
     And I click on "Edit profile" "link" in the "region-main" "region"
     Then I should see "Foo"
     And I should see "Bar"
     When I set the field "First name" to " "
-    And I set the field "Surname" to " "
+    And I set the field "Last name" to " "
     And I click on "Update profile" "button"
     Then I should see "Missing given name"
-    And I should see "Missing surname"
+    And I should see "Missing last name"
diff --git a/user/tests/behat/table_sorting.feature b/user/tests/behat/table_sorting.feature
index 70c7c2bd140..9d0946f06d5 100644
--- a/user/tests/behat/table_sorting.feature
+++ b/user/tests/behat/table_sorting.feature
@@ -20,7 +20,7 @@ Feature: Tables can be sorted by additional names
   Scenario: All user names are show and sortable in the administration user list.
     Given I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "users" table:
-    | First name / Middle name / Alternate name / Surname | Email address |
+    | First name / Middle name / Alternate name / Last name | Email address |
     | Admin User | moodle@example.com |
     | Annie Faith Anne Edison | student1@example.com |
     | George David Gman Bradley | student2@example.com |
@@ -39,9 +39,9 @@ Feature: Tables can be sorted by additional names
     And I follow "Alternate name"
     And "Annie Faith Anne Edison" "table_row" should appear after "George David Gman Bradley" "table_row"
     And "George David Gman Bradley" "table_row" should appear after "Travis Peter Mr T Sutcliff" "table_row"
-    And I follow "Surname"
+    And I follow "Last name"
     And "George David Gman Bradley" "table_row" should appear before "Annie Faith Anne Edison" "table_row"
     And "Annie Faith Anne Edison" "table_row" should appear before "Travis Peter Mr T Sutcliff" "table_row"
-    And I follow "Surname"
+    And I follow "Last name"
     And "George David Gman Bradley" "table_row" should appear after "Annie Faith Anne Edison" "table_row"
     And "Annie Faith Anne Edison" "table_row" should appear after "Travis Peter Mr T Sutcliff" "table_row"