diff --git a/backup/util/ui/tests/behat/restore_moodle2_courses_settings.feature b/backup/util/ui/tests/behat/restore_moodle2_courses_settings.feature
index fabadbac987..86939ccf9cd 100644
--- a/backup/util/ui/tests/behat/restore_moodle2_courses_settings.feature
+++ b/backup/util/ui/tests/behat/restore_moodle2_courses_settings.feature
@@ -21,7 +21,7 @@ Feature: Restore Moodle 2 course backups with different user data settings
       | data     | Test database name | n     | C1     | data1    |
     And I log in as "teacher1"
     And I am on "Course 1" course homepage
-    And I add a "Text input" field to "Test database name" database and I fill the form with:
+    And I add a "Short text" field to "Test database name" database and I fill the form with:
       | Field name | Test field name |
       | Field description | Test field description |
     And I navigate to "Templates" in current page administration
diff --git a/blocks/myoverview/lang/en/block_myoverview.php b/blocks/myoverview/lang/en/block_myoverview.php
index 9fe750d359c..50f9d692c02 100644
--- a/blocks/myoverview/lang/en/block_myoverview.php
+++ b/blocks/myoverview/lang/en/block_myoverview.php
@@ -22,12 +22,12 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['allincludinghidden'] = 'All (including archived)';
+$string['allincludinghidden'] = 'All (including removed from view)';
 $string['all'] = 'All';
 $string['addtofavourites'] = 'Star this course';
 $string['aria:addtofavourites'] = 'Star for';
 $string['aria:allcoursesincludinghidden'] = 'Show all courses';
-$string['aria:allcourses'] = 'Show all courses except archived courses';
+$string['aria:allcourses'] = 'Show all courses except courses removed from view';
 $string['aria:card'] = 'Switch to card view';
 $string['aria:controls'] = 'Course overview controls';
 $string['aria:courseactions'] = 'Actions for current course';
@@ -77,11 +77,11 @@ $string['summary'] = 'Summary';
 $string['title'] = 'Course name';
 $string['aria:hidecourse'] = 'Remove {$a} from view';
 $string['aria:showcourse'] = 'Restore {$a} to view';
-$string['aria:hiddencourses'] = 'Show archived courses';
-$string['hidden'] = 'Archived courses';
-$string['hidecourse'] = 'Archive';
-$string['hiddencourses'] = 'Archived';
-$string['show'] = 'Unarchive';
+$string['aria:hiddencourses'] = 'Show courses removed from view';
+$string['hidden'] = 'Courses removed from view';
+$string['hidecourse'] = 'Remove from view';
+$string['hiddencourses'] = 'Removed from view';
+$string['show'] = 'Restore to view';
 $string['sortbytitle'] = 'Sort by course name';
 $string['sortbylastaccessed'] = 'Sort by last accessed';
 $string['sortbyshortname'] = 'Sort by short name';
diff --git a/blocks/myoverview/tests/behat/block_myoverview_adminsettings.feature b/blocks/myoverview/tests/behat/block_myoverview_adminsettings.feature
index 25a1c148346..d962f0844bd 100644
--- a/blocks/myoverview/tests/behat/block_myoverview_adminsettings.feature
+++ b/blocks/myoverview/tests/behat/block_myoverview_adminsettings.feature
@@ -26,26 +26,26 @@ Feature: The my overview block allows admins to easily configure the students' c
       | student1 | C4 | student |
       | student1 | C5 | student |
 
-  Scenario: Enable 'All (including archived)' course filter option
+  Scenario: Enable 'All (including removed from view)' course filter option
     Given I log in as "admin"
     And I navigate to "Plugins > Blocks > Course overview" in site administration
-    And I set the field "All (including archived)" to "1"
+    And I set the field "All (including removed from view)" to "1"
     And I press "Save"
     And I log out
     Then I am on the "My courses" page logged in as "student1"
     And I click on "All" "button" in the "Course overview" "block"
     # We have to check for the data attribute instead of the list element text as we would get false positives from the "All" element otherwise
-    Then "All (including archived)" "list_item" should exist in the ".block_myoverview .dropdown-menu" "css_element"
+    Then "All (including removed from view)" "list_item" should exist in the ".block_myoverview .dropdown-menu" "css_element"
 
-  Scenario: Disable 'All (including archived)' course filter option
+  Scenario: Disable 'All (including removed from view)' course filter option
     Given I log in as "admin"
     And I navigate to "Plugins > Blocks > Course overview" in site administration
-    And I set the field "All (including archived)" to "0"
+    And I set the field "All (including removed from view)" to "0"
     And I press "Save"
     And I log out
     Then I am on the "My courses" page logged in as "student1"
     And I click on "All" "button" in the "Course overview" "block"
-    Then "All (including archived)" "list_item" should not exist in the ".block_myoverview .dropdown-menu" "css_element"
+    Then "All (including removed from view)" "list_item" should not exist in the ".block_myoverview .dropdown-menu" "css_element"
 
   Scenario: Enable 'All' course filter option
     Given I log in as "admin"
@@ -76,7 +76,7 @@ Feature: The my overview block allows admins to easily configure the students' c
     And I log out
     Then I am on the "My courses" page logged in as "student1"
     And I click on "All" "button" in the "Course overview" "block"
-    # We have to check for the data attribute instead of the list element text as we would get false negatives "All (including archived)" element otherwise
+    # We have to check for the data attribute instead of the list element text as we would get false negatives "All (including removed from view)" element otherwise
     Then "In progress" "list_item" should exist in the ".block_myoverview .dropdown-menu" "css_element"
 
   Scenario: Disable 'In progress' course filter option
@@ -152,33 +152,33 @@ Feature: The my overview block allows admins to easily configure the students' c
   Scenario: Enable 'Removed courses' course filter option
     Given I log in as "admin"
     And I navigate to "Plugins > Blocks > Course overview" in site administration
-    And I set the field "Archived" to "1"
+    And I set the field "Removed from view" to "1"
     And I press "Save"
     And I log out
     Then I am on the "My courses" page logged in as "student1"
     And I click on "All" "button" in the "Course overview" "block"
-    Then "Archived" "list_item" should exist in the ".block_myoverview .dropdown-menu" "css_element"
+    Then "Removed from view" "list_item" should exist in the ".block_myoverview .dropdown-menu" "css_element"
 
   Scenario: Disable 'Removed courses' course filter option
     Given I log in as "admin"
     And I navigate to "Plugins > Blocks > Course overview" in site administration
-    And I set the field "Archived" to "0"
+    And I set the field "Removed from view" to "0"
     And I press "Save"
     And I log out
     Then I am on the "My courses" page logged in as "student1"
     And I click on "All" "button" in the "Course overview" "block"
-    Then "Archived" "list_item" should not exist in the ".block_myoverview .dropdown-menu" "css_element"
+    Then "Removed from view" "list_item" should not exist in the ".block_myoverview .dropdown-menu" "css_element"
 
   Scenario: Disable all course filter options
     Given I log in as "admin"
     And I navigate to "Plugins > Blocks > Course overview" in site administration
-    And I set the field "All (including archived)" to "0"
+    And I set the field "All (including removed from view)" to "0"
     And I set the field "All" in the "//*[@id=\"admin-displaygroupingall\"]" "xpath_element" to "0"
     And I set the field "In progress" to "0"
     And I set the field "Future" to "0"
     And I set the field "Past" to "0"
     And I set the field "Starred" to "0"
-    And I set the field "Archived" to "0"
+    And I set the field "Removed from view" to "0"
     And I press "Save"
     And I log out
     And I am on the "My courses" page logged in as "student1"
@@ -192,13 +192,13 @@ Feature: The my overview block allows admins to easily configure the students' c
   Scenario: Disable all but one course filter option
     Given I log in as "admin"
     And I navigate to "Plugins > Blocks > Course overview" in site administration
-    And I set the field "All (including archived)" to "0"
+    And I set the field "All (including removed from view)" to "0"
     And I set the field "All" in the "//*[@id=\"admin-displaygroupingall\"]" "xpath_element" to "0"
     And I set the field "In progress" to "1"
     And I set the field "Future" to "0"
     And I set the field "Past" to "0"
     And I set the field "Starred" to "0"
-    And I set the field "Archived" to "0"
+    And I set the field "Removed from view" to "0"
     And I press "Save"
     And I log out
     And I am on the "My courses" page logged in as "student1"
diff --git a/blocks/myoverview/tests/behat/block_myoverview_dashboard.feature b/blocks/myoverview/tests/behat/block_myoverview_dashboard.feature
index 43ca3107849..b4b495250d0 100644
--- a/blocks/myoverview/tests/behat/block_myoverview_dashboard.feature
+++ b/blocks/myoverview/tests/behat/block_myoverview_dashboard.feature
@@ -66,13 +66,13 @@ Feature: The my overview block allows users to easily access their courses
     Then I should see "Course 4" in the "Course overview" "block"
     Then I should see "Course 5" in the "Course overview" "block"
 
-  Scenario: View all (including archived) courses
+  Scenario: View all (including removed from view) courses
     Given the following config values are set as admin:
       | config                            | value | plugin           |
       | displaygroupingallincludinghidden | 1     | block_myoverview |
     And I am on the "My courses" page logged in as "student1"
     And I click on "All" "button" in the "Course overview" "block"
-    # We have to click on the data attribute instead of the button element text as we might risk to click on the false positive "All (including archived)" element instead
+    # We have to click on the data attribute instead of the button element text as we might risk to click on the false positive "All (including removed from view)" element instead
     When I click on "[data-value='allincludinghidden']" "css_element" in the "Course overview" "block"
     Then I should see "Course 1" in the "Course overview" "block"
     Then I should see "Course 2" in the "Course overview" "block"
@@ -203,7 +203,7 @@ Feature: The my overview block allows users to easily access their courses
     When I click on "In progress" "link" in the "Course overview" "block"
     And I hover "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     And I click on ".coursemenubtn" "css_element" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
-    And I click on "Archive" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
+    And I click on "Remove from view" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     And I reload the page
     Then I should see "Course 3" in the "Course overview" "block"
     Then I should see "Course 4" in the "Course overview" "block"
@@ -217,7 +217,7 @@ Feature: The my overview block allows users to easily access their courses
     When I click on "Past" "link" in the "Course overview" "block"
     And I hover "//div[@class='card dashboard-card' and contains(.,'Course 1')]" "xpath_element"
     And I click on ".coursemenubtn" "css_element" in the "//div[@class='card dashboard-card' and contains(.,'Course 1')]" "xpath_element"
-    And I click on "Archive" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 1')]" "xpath_element"
+    And I click on "Remove from view" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 1')]" "xpath_element"
     And I reload the page
     Then I should not see "Course 1" in the "Course overview" "block"
     And I should not see "Course 2" in the "Course overview" "block"
@@ -231,7 +231,7 @@ Feature: The my overview block allows users to easily access their courses
     When I click on "Future" "link" in the "Course overview" "block"
     And I hover "//div[@class='card dashboard-card' and contains(.,'Course 5')]" "xpath_element"
     And I click on ".coursemenubtn" "css_element" in the "//div[@class='card dashboard-card' and contains(.,'Course 5')]" "xpath_element"
-    And I click on "Archive" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 5')]" "xpath_element"
+    And I click on "Remove from view" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 5')]" "xpath_element"
     And I reload the page
     Then I should not see "Course 5" in the "Course overview" "block"
     And I should not see "Course 1" in the "Course overview" "block"
@@ -245,7 +245,7 @@ Feature: The my overview block allows users to easily access their courses
     When I click on "All" "link" in the "Course overview" "block"
     And I hover "//div[@class='card dashboard-card' and contains(.,'Course 5')]" "xpath_element"
     And I click on ".coursemenubtn" "css_element" in the "//div[@class='card dashboard-card' and contains(.,'Course 5')]" "xpath_element"
-    And I click on "Archive" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 5')]" "xpath_element"
+    And I click on "Remove from view" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 5')]" "xpath_element"
     And I reload the page
     Then I should not see "Course 5" in the "Course overview" "block"
     And I should see "Course 1" in the "Course overview" "block"
@@ -253,17 +253,17 @@ Feature: The my overview block allows users to easily access their courses
     And I should see "Course 3" in the "Course overview" "block"
     And I should see "Course 4" in the "Course overview" "block"
 
-  Scenario: View all (including archived) courses with hide persistent functionality
+  Scenario: View all (including removed from view) courses with hide persistent functionality
     Given the following config values are set as admin:
       | config                            | value | plugin           |
       | displaygroupingallincludinghidden | 1     | block_myoverview |
     And I am on the "My courses" page logged in as "student1"
     And I click on "All" "button" in the "Course overview" "block"
-    # We have to click on the data attribute instead of the button element text as we might risk to click on the false positive "All (including archived)" element instead
+    # We have to click on the data attribute instead of the button element text as we might risk to click on the false positive "All (including removed from view)" element instead
     When I click on "[data-value='allincludinghidden']" "css_element" in the "Course overview" "block"
     And I hover "//div[@class='card dashboard-card' and contains(.,'Course 5')]" "xpath_element"
     And I click on ".coursemenubtn" "css_element" in the "//div[@class='card dashboard-card' and contains(.,'Course 5')]" "xpath_element"
-    And I click on "Archive" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 5')]" "xpath_element"
+    And I click on "Remove from view" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 5')]" "xpath_element"
     And I reload the page
     Then I should see "Course 5" in the "Course overview" "block"
     And I should see "Course 1" in the "Course overview" "block"
diff --git a/blocks/myoverview/tests/behat/block_myoverview_hidden.feature b/blocks/myoverview/tests/behat/block_myoverview_hidden.feature
index e27ef877174..c0bb19069a6 100644
--- a/blocks/myoverview/tests/behat/block_myoverview_hidden.feature
+++ b/blocks/myoverview/tests/behat/block_myoverview_hidden.feature
@@ -29,7 +29,7 @@ Feature: The my overview block allows users to hide their courses
     When I click on "All" "link" in the "Course overview" "block"
     And I hover "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     And I click on ".coursemenubtn" "css_element" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
-    And I click on "Archive" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
+    And I click on "Remove from view" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     And I reload the page
     Then I should not see "Course 2" in the "Course overview" "block"
 
@@ -42,14 +42,14 @@ Feature: The my overview block allows users to hide their courses
     And I click on "Star this course" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     And I hover "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     And I click on ".coursemenubtn" "css_element" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
-    And I click on "Archive" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
+    And I click on "Remove from view" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     When I reload the page
     Then I should not see "Course 2" in the "Course overview" "block"
     And I click on "All" "button" in the "Course overview" "block"
     And I click on "Starred" "link" in the "Course overview" "block"
     Then I should not see "Course 2" in the "Course overview" "block"
     And I click on "Starred" "button" in the "Course overview" "block"
-    And I click on "Archived" "link" in the "Course overview" "block"
+    And I click on "Removed from view" "link" in the "Course overview" "block"
     Then I should see "Course 2" in the "Course overview" "block"
 
   Scenario: Test show toggle functionality
@@ -58,14 +58,14 @@ Feature: The my overview block allows users to hide their courses
     When I click on "All" "link" in the "Course overview" "block"
     And I hover "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     And I click on ".coursemenubtn" "css_element" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
-    And I click on "Archive" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
+    And I click on "Remove from view" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     When I click on "All" "button" in the "Course overview" "block"
-    And I click on "Archived" "link" in the "Course overview" "block"
+    And I click on "Removed from view" "link" in the "Course overview" "block"
     And I hover "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     When I click on ".coursemenubtn" "css_element" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
-    And I click on "Unarchive" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
+    And I click on "Restore to view" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     And I reload the page
-    And I click on "Archived" "button" in the "Course overview" "block"
+    And I click on "Removed from view" "button" in the "Course overview" "block"
     When I click on "All" "link" in the "Course overview" "block"
     Then I should see "Course 2" in the "Course overview" "block"
 
@@ -78,16 +78,16 @@ Feature: The my overview block allows users to hide their courses
     And I click on "Star this course" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     And I hover "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     And I click on ".coursemenubtn" "css_element" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
-    And I click on "Archive" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
+    And I click on "Remove from view" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     And I click on "All" "button" in the "Course overview" "block"
-    And I click on "Archived" "link" in the "Course overview" "block"
+    And I click on "Removed from view" "link" in the "Course overview" "block"
     And I should see "Course 2" in the "Course overview" "block"
     And I hover "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     And I click on ".coursemenubtn" "css_element" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
-    And I click on "Unarchive" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
+    And I click on "Restore to view" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     When I reload the page
     Then I should not see "Course 2" in the "Course overview" "block"
-    And I click on "Archived" "button" in the "Course overview" "block"
+    And I click on "Removed from view" "button" in the "Course overview" "block"
     And I click on "All" "link" in the "Course overview" "block"
     Then I should see "Course 2" in the "Course overview" "block"
     And I click on "All" "button" in the "Course overview" "block"
@@ -100,10 +100,10 @@ Feature: The my overview block allows users to hide their courses
     When I click on "All" "link" in the "Course overview" "block"
     And I hover "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     And I click on ".coursemenubtn" "css_element" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
-    And I click on "Archive" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
+    And I click on "Remove from view" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     Then I should not see "Course 2" in the "Course overview" "block"
 
-  Scenario: Test a course is never hidden with "All (including archived)" courses
+  Scenario: Test a course is never hidden with "All (including removed from view)" courses
     Given the following config values are set as admin:
       | config                            | value | plugin           |
       | displaygroupingallincludinghidden | 1     | block_myoverview |
@@ -113,15 +113,15 @@ Feature: The my overview block allows users to hide their courses
     When I click on "[data-value='allincludinghidden']" "css_element" in the "Course overview" "block"
     And I hover "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     And I click on ".coursemenubtn" "css_element" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
-    And I click on "Archive" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
+    And I click on "Remove from view" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     Then I should see "Course 2" in the "Course overview" "block"
     And I hover "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     And I click on ".coursemenubtn" "css_element" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
-    And I should not see "Archive" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
-    And I should see "Unarchive" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
-    And I click on "Unarchive" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
+    And I should not see "Remove from view" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
+    And I should see "Restore to view" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
+    And I click on "Restore to view" "link" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     Then I should see "Course 2" in the "Course overview" "block"
     And I hover "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
     And I click on ".coursemenubtn" "css_element" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
-    And I should see "Archive" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
-    And I should not see "Unarchive" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
+    And I should see "Remove from view" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
+    And I should not see "Restore to view" in the "//div[@class='card dashboard-card' and contains(.,'Course 2')]" "xpath_element"
diff --git a/lang/en/admin.php b/lang/en/admin.php
index 532d731e4fb..09f6f4cd97f 100644
--- a/lang/en/admin.php
+++ b/lang/en/admin.php
@@ -421,7 +421,7 @@ $string['courselistshortnames_desc'] = 'If enabled, course short names will be d
 $string['coursemgmt'] = 'Manage courses and categories';
 $string['courseoverview'] = 'Course overview';
 $string['courserequestnotify'] = 'Course request notification';
-$string['courserequestnotifyemail'] = 'User {$a->user} requested a new course at {$a->link}';
+$string['courserequestnotifyemail'] = '{$a->user} requested a new course <a href="{$a->link}">{$a->link}</a>';
 $string['courserequests'] = 'Course requests';
 $string['courserequestspending'] = 'Pending course requests';
 $string['courses'] = 'Courses';
diff --git a/lang/en/backup.php b/lang/en/backup.php
index cd471701c1f..40a7e45271a 100644
--- a/lang/en/backup.php
+++ b/lang/en/backup.php
@@ -36,7 +36,7 @@ $string['asyncemailenable'] = 'Enable message notifications';
 $string['asyncemailenabledetail'] = 'If enabled, users will receive a message when an asynchronous backup or restore completes.';
 $string['asyncmessagebody'] = 'Message';
 $string['asyncmessagebodydetail'] = 'Message to send when an asynchronous backup or restore completes.';
-$string['asyncmessagebodydefault'] = 'Hi {user_firstname},<br/> Your {operation} (ID: {backupid}) has completed successfully. <br/><br/>You can access it here: {link}.';
+$string['asyncmessagebodydefault'] = 'Your {operation} (ID: {backupid}) has completed successfully. You can access it here: <a href="{link}">{link}</a>.';
 $string['asyncmessagesubject'] = 'Subject';
 $string['asyncmessagesubjectdetail'] = 'Message subject';
 $string['asyncmessagesubjectdefault'] = 'Moodle {operation} completed successfully';
diff --git a/lang/en/form.php b/lang/en/form.php
index 9d776723814..66eaaba3717 100644
--- a/lang/en/form.php
+++ b/lang/en/form.php
@@ -81,7 +81,7 @@ $string['selecteditems'] = 'Selected items:';
 $string['showadvanced'] = 'Show advanced';
 $string['showless'] = 'Show less...';
 $string['showmore'] = 'Show more...';
-$string['somefieldsrequired'] = 'There are required fields in this form marked {$a}.';
+$string['somefieldsrequired'] = '{$a} Required';
 $string['suggestions'] = 'Suggestions';
 $string['time'] = 'Time';
 $string['timeunit'] = 'Time unit';
diff --git a/lang/en/message.php b/lang/en/message.php
index 24bccaacd14..18e6ebfdd13 100644
--- a/lang/en/message.php
+++ b/lang/en/message.php
@@ -64,7 +64,7 @@ $string['disableall'] = 'Disable notifications';
 $string['disabled'] = 'Messaging is disabled on this site';
 $string['disallowed'] = 'Locked off';
 $string['editmessages'] = 'Edit messages';
-$string['emailtagline'] = 'This is a copy of a message sent to you at "{$a->sitename}". Go to {$a->url} to reply.';
+$string['emailtagline'] = 'This is a copy of a message sent to you on the site {$a->sitename}. Go to <a href="{$a->url}">{$a->url}</a> to reply.';
 $string['enabled'] = 'Enabled';
 $string['errorcallingprocessor'] = 'Error calling defined output';
 $string['errorconversationdoesnotexist'] = 'Conversation does not exist';
diff --git a/lib/form/tests/behat/graderescale_for_database_pointscale.feature b/lib/form/tests/behat/graderescale_for_database_pointscale.feature
index d629fabb310..474f4f6a218 100644
--- a/lib/form/tests/behat/graderescale_for_database_pointscale.feature
+++ b/lib/form/tests/behat/graderescale_for_database_pointscale.feature
@@ -23,7 +23,7 @@ Feature: Using the database activities which support point scale
   @javascript
   Scenario: Database rescale grade should not be possible when users are graded
     Given I am on the "Course 1" course page logged in as teacher1
-    And I add a "Text input" field to "Test database name" database and I fill the form with:
+    And I add a "Short text" field to "Test database name" database and I fill the form with:
       | Field name | Test field name |
       | Field description | Test field description |
     And I navigate to "Templates" in current page administration
diff --git a/mod/data/field/checkbox/lang/en/datafield_checkbox.php b/mod/data/field/checkbox/lang/en/datafield_checkbox.php
index 6c2d8bf27b6..dea697442ba 100644
--- a/mod/data/field/checkbox/lang/en/datafield_checkbox.php
+++ b/mod/data/field/checkbox/lang/en/datafield_checkbox.php
@@ -24,6 +24,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['pluginname'] = 'Checkbox';
-$string['fieldtypelabel'] = 'Checkbox field';
-$string['privacy:metadata'] = 'The Checkbox field component does not store any personal data itself, it uses tables defined in mod_data.';
+$string['pluginname'] = 'Checkboxes';
+$string['fieldtypelabel'] = 'Checkboxes';
+$string['privacy:metadata'] = 'The Checkboxes field component doesn\'t store any personal data; it uses tables defined in mod_data.';
diff --git a/mod/data/field/date/lang/en/datafield_date.php b/mod/data/field/date/lang/en/datafield_date.php
index 304ac62e50a..4df6a6ce1da 100644
--- a/mod/data/field/date/lang/en/datafield_date.php
+++ b/mod/data/field/date/lang/en/datafield_date.php
@@ -25,5 +25,5 @@
  */
 
 $string['pluginname'] = 'Date';
-$string['fieldtypelabel'] = 'Date field';
-$string['privacy:metadata'] = 'The Date field component does not store any personal data, it uses tables defined in mod_data.';
+$string['fieldtypelabel'] = 'Date';
+$string['privacy:metadata'] = 'The Date field component doesn\'t store any personal data; it uses tables defined in mod_data.';
diff --git a/mod/data/field/file/lang/en/datafield_file.php b/mod/data/field/file/lang/en/datafield_file.php
index 4aaa5ba23bb..fd180819067 100644
--- a/mod/data/field/file/lang/en/datafield_file.php
+++ b/mod/data/field/file/lang/en/datafield_file.php
@@ -25,5 +25,5 @@
  */
 
 $string['pluginname'] = 'File';
-$string['fieldtypelabel'] = 'File field';
-$string['privacy:metadata'] = 'The File field component does not store any personal data, it uses tables defined in mod_data.';
+$string['fieldtypelabel'] = 'File';
+$string['privacy:metadata'] = 'The File field component doesn\'t store any personal data; it uses tables defined in mod_data.';
diff --git a/mod/data/field/latlong/lang/en/datafield_latlong.php b/mod/data/field/latlong/lang/en/datafield_latlong.php
index a3a7a33ed9a..2d80e3958d4 100644
--- a/mod/data/field/latlong/lang/en/datafield_latlong.php
+++ b/mod/data/field/latlong/lang/en/datafield_latlong.php
@@ -24,6 +24,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['pluginname'] = 'Latlong';
-$string['fieldtypelabel'] = 'Latitude/longitude field';
-$string['privacy:metadata'] = 'The Latitude/longitude field component does not store any personal data, it uses tables defined in mod_data.';
+$string['pluginname'] = 'Coordinates';
+$string['fieldtypelabel'] = 'Coordinates';
+$string['privacy:metadata'] = 'The Coordinates field component doesn\'t store any personal data; it uses tables defined in mod_data.';
diff --git a/mod/data/field/menu/lang/en/datafield_menu.php b/mod/data/field/menu/lang/en/datafield_menu.php
index c6ebec58d8d..b66117bd33c 100644
--- a/mod/data/field/menu/lang/en/datafield_menu.php
+++ b/mod/data/field/menu/lang/en/datafield_menu.php
@@ -24,6 +24,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['pluginname'] = 'Menu';
-$string['fieldtypelabel'] = 'Menu field';
-$string['privacy:metadata'] = 'The Menu field component does not store any personal data, it uses tables defined in mod_data.';
+$string['pluginname'] = 'Dropdown list';
+$string['fieldtypelabel'] = 'Dropdown list';
+$string['privacy:metadata'] = 'The Dropdown list field component doesn\'t store any personal data; it uses tables defined in mod_data.';
diff --git a/mod/data/field/multimenu/lang/en/datafield_multimenu.php b/mod/data/field/multimenu/lang/en/datafield_multimenu.php
index 847a49e2a1d..f770bfb4e24 100644
--- a/mod/data/field/multimenu/lang/en/datafield_multimenu.php
+++ b/mod/data/field/multimenu/lang/en/datafield_multimenu.php
@@ -24,6 +24,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['pluginname'] = 'Multimenu';
-$string['fieldtypelabel'] = 'Multiple-selection menu field';
-$string['privacy:metadata'] = 'The Multiple-selection menu field component does not store any personal data, it uses tables defined in mod_data.';
+$string['pluginname'] = 'Multi-select list';
+$string['fieldtypelabel'] = 'Multi-select list';
+$string['privacy:metadata'] = 'The Multi-select list field component doesn\'t store any personal data, it uses tables defined in mod_data';
diff --git a/mod/data/field/number/lang/en/datafield_number.php b/mod/data/field/number/lang/en/datafield_number.php
index 27659f38f5a..d8daf546f28 100644
--- a/mod/data/field/number/lang/en/datafield_number.php
+++ b/mod/data/field/number/lang/en/datafield_number.php
@@ -25,5 +25,5 @@
  */
 
 $string['pluginname'] = 'Number';
-$string['fieldtypelabel'] = 'Number field';
-$string['privacy:metadata'] = 'The Number field component does not store any personal data, it uses tables defined in mod_data.';
+$string['fieldtypelabel'] = 'Number';
+$string['privacy:metadata'] = 'The Number field component doesn\'t store any personal data; it uses tables defined in mod_data.';
diff --git a/mod/data/field/picture/lang/en/datafield_picture.php b/mod/data/field/picture/lang/en/datafield_picture.php
index ea29945adfe..77144a62087 100644
--- a/mod/data/field/picture/lang/en/datafield_picture.php
+++ b/mod/data/field/picture/lang/en/datafield_picture.php
@@ -24,6 +24,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['pluginname'] = 'Picture';
-$string['fieldtypelabel'] = 'Picture field';
-$string['privacy:metadata'] = 'The Picture field component does not store any personal data, it uses tables defined in mod_data.';
+$string['pluginname'] = 'Image';
+$string['fieldtypelabel'] = 'Image';
+$string['privacy:metadata'] = 'The Image field component doesn\'t store any personal data; it uses tables defined in mod_data.';
diff --git a/mod/data/field/radiobutton/lang/en/datafield_radiobutton.php b/mod/data/field/radiobutton/lang/en/datafield_radiobutton.php
index bd264e3beb3..5cd6ab50d78 100644
--- a/mod/data/field/radiobutton/lang/en/datafield_radiobutton.php
+++ b/mod/data/field/radiobutton/lang/en/datafield_radiobutton.php
@@ -24,7 +24,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['pluginname'] = 'Radio button';
-$string['fieldtypelabel'] = 'Radio button field';
-$string['privacy:metadata'] = 'The Radio button field component does not store any personal data, it uses tables defined in mod_data.';
+$string['pluginname'] = 'Radio buttons';
+$string['fieldtypelabel'] = 'Radio buttons';
+$string['privacy:metadata'] = 'The Radio buttons field component doesn\'t store any personal data; it uses tables defined in mod_data.';
 
diff --git a/mod/data/field/text/lang/en/datafield_text.php b/mod/data/field/text/lang/en/datafield_text.php
index b4e3c2d3631..5d495bc3b55 100644
--- a/mod/data/field/text/lang/en/datafield_text.php
+++ b/mod/data/field/text/lang/en/datafield_text.php
@@ -24,6 +24,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['pluginname'] = 'Text input';
-$string['fieldtypelabel'] = 'Text field';
-$string['privacy:metadata'] = 'The Text field component does not store any personal data, it uses tables defined in mod_data.';
+$string['pluginname'] = 'Short text';
+$string['fieldtypelabel'] = 'Short text';
+$string['privacy:metadata'] = 'The Short text field component doesn\'t store any personal data; it uses tables defined in mod_data.';
diff --git a/mod/data/field/textarea/lang/en/datafield_textarea.php b/mod/data/field/textarea/lang/en/datafield_textarea.php
index 00a3785163a..3d08ba8a654 100644
--- a/mod/data/field/textarea/lang/en/datafield_textarea.php
+++ b/mod/data/field/textarea/lang/en/datafield_textarea.php
@@ -27,5 +27,5 @@
 $string['maxbytes'] = 'Maximum embedded file size (bytes)';
 $string['maxbytes_desc'] = 'If set to zero will be unlimited by default';
 $string['pluginname'] = 'Text area';
-$string['fieldtypelabel'] = 'Textarea field';
-$string['privacy:metadata'] = 'The Textarea field component does not store any personal data, it uses tables defined in mod_data.';
+$string['fieldtypelabel'] = 'Text area';
+$string['privacy:metadata'] = 'The Text area field component doesn\'t store any personal data; it uses tables defined in mod_data.';
diff --git a/mod/data/field/url/lang/en/datafield_url.php b/mod/data/field/url/lang/en/datafield_url.php
index b17b6905017..b6fd71f17e7 100644
--- a/mod/data/field/url/lang/en/datafield_url.php
+++ b/mod/data/field/url/lang/en/datafield_url.php
@@ -26,5 +26,5 @@
 
 $string['pluginname'] = 'URL';
 $string['openlinkinnewwindow'] = 'Open link in new window';
-$string['fieldtypelabel'] = 'URL field';
-$string['privacy:metadata'] = 'The URL field component does not store any personal data, it uses tables defined in mod_data.';
+$string['fieldtypelabel'] = 'URL';
+$string['privacy:metadata'] = 'The URL field component doesn\'t store any personal data; it uses tables defined in mod_data.';
diff --git a/mod/data/lang/en/data.php b/mod/data/lang/en/data.php
index 69350f11b8f..d5074ca9c87 100644
--- a/mod/data/lang/en/data.php
+++ b/mod/data/lang/en/data.php
@@ -95,7 +95,7 @@ $string['data:exportuserinfo'] = 'Export user information';
 $string['data:managecomments'] = 'Manage comments';
 $string['data:manageentries'] = 'Manage entries';
 $string['data:managetemplates'] = 'Manage templates';
-$string['data:manageuserpresets'] = 'Manage all template presets';
+$string['data:manageuserpresets'] = 'Manage presets';
 $string['data:rate'] = 'Rate entries';
 $string['data:readentry'] = 'Read entries';
 $string['data:viewalluserpresets'] = 'View presets from all users';
@@ -202,7 +202,7 @@ $string['headerjstemplate'] = 'Defines custom Javascript for manipulating the wa
 $string['headerlisttemplate'] = 'Defines browsing interface for multiple entries';
 $string['headerrsstemplate'] = 'Defines appearance of entries in RSS feeds';
 $string['headersingletemplate'] = 'Defines browsing interface for a single entry';
-$string['checkbox'] = 'Checkbox';
+$string['checkbox'] = 'Checkboxes';
 $string['chooseexportfields'] = 'Choose the fields you wish to export';
 $string['chooseexportformat'] = 'Choose the format you wish to export to';
 $string['chooseorupload'] = 'Choose file';
@@ -236,7 +236,7 @@ $string['invalidrecord'] = 'Incorrect record';
 $string['invalidurl'] = 'The URL you just entered is not valid';
 $string['jstemplate'] = 'Javascript template';
 $string['latitude'] = 'Latitude';
-$string['latlong'] = 'Latitude/longitude';
+$string['latlong'] = 'Coordinates';
 $string['latlongboth'] = 'Both latitude and longitude are required.';
 $string['latlongdownloadallhint'] = 'Download link for all entries as KML';
 $string['latlongkmllabelling'] = 'How to label items in KML files (Google Earth)';
@@ -260,18 +260,18 @@ $string['menuchoose'] = 'Choose...';
 $string['missingdata'] = 'Data id or object must be provided to field class';
 $string['missingfield'] = 'Programmer error: You must specify field and/or data when defining field class.';
 $string['modulename'] = 'Database';
-$string['modulename_help'] = 'The database activity module enables participants to create, maintain and search a collection of entries (i.e. records).  The structure of the entries is defined by the teacher as a number of fields. Field types include checkbox, radio buttons, drop-down menu, text area, URL, picture and uploaded file.
+$string['modulename_help'] = 'Database enables participants to create, maintain, and search a collection of entries.
 
-The visual layout of information when listing, viewing or editing database entries may be controlled by database templates. Database activities may be shared between courses as presets and a teacher may also import and export database entries.
+The structure of the entries is defined using different types of fields, such as short text, dropdown list, text area, URL, image, or file.
 
-If the database auto-linking filter is enabled, any entries in a database will be automatically linked where the words or phrases appear within the course.
+As a teacher, you can comment and rate entries. You can also allow students to rate and comment on entries (peer evaluation). Ratings can be aggregated to form a final grade, which is recorded in the gradebook.
 
-A teacher can allow comments on entries. Entries can also be rated by teachers or students (peer evaluation). Ratings can be aggregated to form a final grade which is recorded in the gradebook.
+If the Database auto-linking filter is enabled, any entries in a database will be automatically linked where the words or phrases appear within the course.
 
-Database activities have many uses, such as
+You can use Database to:
 
-* A collaborative collection of web links, books, book reviews, journal references etc
-* For displaying student-created photos, posters, websites or poems for peer comment and review.';
+* Create a collaborative collection of links, books, book reviews, journal references, etc.
+* Display student-created photos, posters, websites or poems for peer comment and review.';
 $string['modulename_link'] = 'mod/data/view';
 $string['modulenameplural'] = 'Databases';
 $string['more'] = 'More';
@@ -399,7 +399,7 @@ $string['templates'] = 'Templates';
 $string['templatesnavigation'] = 'Templates tertiary navigation';
 $string['templatesaved'] = 'Template saved';
 $string['text'] = 'Text';
-$string['textarea'] = 'Textarea';
+$string['textarea'] = 'Text area';
 $string['timeadded'] = 'Time added';
 $string['timemodified'] = 'Time modified';
 $string['todatabase'] = 'to this database.';
diff --git a/mod/data/tests/behat/add_entries.feature b/mod/data/tests/behat/add_entries.feature
index f339caaa582..ab3501f7f32 100644
--- a/mod/data/tests/behat/add_entries.feature
+++ b/mod/data/tests/behat/add_entries.feature
@@ -23,10 +23,10 @@ Feature: Users can add entries to database activities
   @javascript
   Scenario: Students can add entries to a database
     Given I am on the "Course 1" course page logged in as teacher1
-    And I add a "Text input" field to "Test database name" database and I fill the form with:
+    And I add a "Short text" field to "Test database name" database and I fill the form with:
       | Field name | Test field name |
       | Field description | Test field description |
-    And I add a "Text input" field to "Test database name" database and I fill the form with:
+    And I add a "Short text" field to "Test database name" database and I fill the form with:
       | Field name | Test field 2 name |
       | Field description | Test field 2 description |
     # To generate the default templates.
@@ -94,7 +94,7 @@ Feature: Users can add entries to database activities
     And I set the following fields to these values:
       | Maximum number of entries | 2 |
     And I press "Save and display"
-    And I add a "Text input" field to "Test database name" database and I fill the form with:
+    And I add a "Short text" field to "Test database name" database and I fill the form with:
       | Field name | Test1 |
     And I navigate to "Templates" in current page administration
     And I press "Save template"
diff --git a/mod/data/tests/behat/data_activity_completion.feature b/mod/data/tests/behat/data_activity_completion.feature
index 23793030429..1629a141d40 100644
--- a/mod/data/tests/behat/data_activity_completion.feature
+++ b/mod/data/tests/behat/data_activity_completion.feature
@@ -34,7 +34,7 @@ Feature: View activity completion in the database activity
       | Require view             | 1                                                 |
       | Require grade            | 1                                                 |
     And I press "Save and display"
-    And I add a "Text input" field to "Music history" database and I fill the form with:
+    And I add a "Short text" field to "Music history" database and I fill the form with:
       | Field name | Instrument types |
     And I navigate to "Templates" in current page administration
     And I press "Save template"
diff --git a/mod/data/tests/behat/data_activity_completion_pass_grade.feature b/mod/data/tests/behat/data_activity_completion_pass_grade.feature
index 8db9772c23a..febb95fea0b 100644
--- a/mod/data/tests/behat/data_activity_completion_pass_grade.feature
+++ b/mod/data/tests/behat/data_activity_completion_pass_grade.feature
@@ -48,7 +48,7 @@ Feature: Completion pass grade
       | completionentriesenabled | 1                                                 |
       | completionentries        | 2                                                 |
     And I press "Save and display"
-    And I add a "Text input" field to "Music history" database and I fill the form with:
+    And I add a "Short text" field to "Music history" database and I fill the form with:
       | Field name | Instrument types |
     And I navigate to "Templates" in current page administration
     And I press "Save template"
diff --git a/mod/data/tests/behat/manageapproved.feature b/mod/data/tests/behat/manageapproved.feature
index 19aed506d19..4f86ecba5a7 100644
--- a/mod/data/tests/behat/manageapproved.feature
+++ b/mod/data/tests/behat/manageapproved.feature
@@ -27,7 +27,7 @@ Feature: Users can edit approved entries in database activities
       | approval       | 1                  |
       | manageapproved | 1                  |
     And I am on the "Test database name" "data activity" page logged in as teacher1
-    And I add a "Text input" field to "Test database name" database and I fill the form with:
+    And I add a "Short text" field to "Test database name" database and I fill the form with:
       | Field name | Test field name |
       | Field description | Test field description |
     # To generate the default templates.
@@ -59,7 +59,7 @@ Feature: Users can edit approved entries in database activities
       | approval       | 1                  |
       | manageapproved | 0                  |
     And I am on the "Test database name" "data activity" page logged in as teacher1
-    And I add a "Text input" field to "Test database name" database and I fill the form with:
+    And I add a "Short text" field to "Test database name" database and I fill the form with:
       | Field name | Test field name |
       | Field description | Test field description |
     # To generate the default templates.
diff --git a/mod/data/tests/behat/required_entries.feature b/mod/data/tests/behat/required_entries.feature
index 4e2fb47c1ff..4b61ceef9eb 100644
--- a/mod/data/tests/behat/required_entries.feature
+++ b/mod/data/tests/behat/required_entries.feature
@@ -21,7 +21,7 @@ Feature: Users can be required to specify certain fields when adding entries to
       | data     | Test database name | n     | C1     | data1    |
     And I log in as "teacher1"
     And I am on "Course 1" course homepage
-    And I add a "Text input" field to "Test database name" database and I fill the form with:
+    And I add a "Short text" field to "Test database name" database and I fill the form with:
       | Field name | Base Text input |
       | Required | yes |
       | Field description | Base Text input |
@@ -42,11 +42,11 @@ Feature: Users can be required to specify certain fields when adding entries to
     RTOC Option 2
     """
     And I press "Add"
-    And I add a "Latlong" field to "Test database name" database and I fill the form with:
-      | Field name | Required Latlong |
-      | Field description | Required Latlong |
+    And I add a "Coordinates" field to "Test database name" database and I fill the form with:
+      | Field name | Required Coordinates |
+      | Field description | Required Coordinates |
       | Required | yes |
-    And I add a "Menu" field to "Test database name" database and I fill the form with:
+    And I add a "Dropdown list" field to "Test database name" database and I fill the form with:
       | Field name | Required Menu |
       | Field description | Required Menu |
       | Required | yes |
@@ -60,7 +60,7 @@ Feature: Users can be required to specify certain fields when adding entries to
       | Field description | Required Radio |
       | Required | yes |
       | Options | Required Radio Option 1 |
-    And I add a "Text input" field to "Test database name" database and I fill the form with:
+    And I add a "Short text" field to "Test database name" database and I fill the form with:
       | Field name | Required Text input |
       | Field description | Required Text input |
       | Required | yes |
@@ -72,13 +72,13 @@ Feature: Users can be required to specify certain fields when adding entries to
       | Field name | Required URL |
       | Field description | Required URL |
       | Required | yes |
-    And I add a "Multimenu" field to "Test database name" database and I fill the form with:
+    And I add a "Multi-select list" field to "Test database name" database and I fill the form with:
       | Field name | Required Multimenu |
       | Field description | Required Multimenu |
       | Required | yes |
       | Options | Option 1 |
     And I follow "Fields"
-    And I select "Multimenu" from the "newtype" singleselect
+    And I select "Multi-select list" from the "newtype" singleselect
     And I set the following fields to these values:
       | Field name | Required Two-Option Multimenu |
       | Field description | Required Two-Option Multimenu |
@@ -93,10 +93,10 @@ Feature: Users can be required to specify certain fields when adding entries to
       | Field name | Not required Checkbox |
       | Field description | Not required Checkbox |
       | Options | Not required Checkbox Option 1 |
-    And I add a "Latlong" field to "Test database name" database and I fill the form with:
-      | Field name | Not required Latlong |
-      | Field description | Not required Latlong |
-    And I add a "Menu" field to "Test database name" database and I fill the form with:
+    And I add a "Coordinates" field to "Test database name" database and I fill the form with:
+      | Field name | Not required Coordinates |
+      | Field description | Not required Coordinates |
+    And I add a "Dropdown list" field to "Test database name" database and I fill the form with:
       | Field name | Not required Menu |
       | Field description | Not required Menu |
       | Options | Option 1 |
@@ -107,7 +107,7 @@ Feature: Users can be required to specify certain fields when adding entries to
       | Field name | Not required Radio |
       | Field description | Not required Radio |
       | Options | Not required Radio Option 1 |
-    And I add a "Text input" field to "Test database name" database and I fill the form with:
+    And I add a "Short text" field to "Test database name" database and I fill the form with:
       | Field name | Not required Text input |
       | Field description | Not required Text input |
     And I add a "Text area" field to "Test database name" database and I fill the form with:
@@ -116,7 +116,7 @@ Feature: Users can be required to specify certain fields when adding entries to
     And I add a "URL" field to "Test database name" database and I fill the form with:
       | Field name | Not required URL |
       | Field description | Not required URL |
-    And I add a "Multimenu" field to "Test database name" database and I fill the form with:
+    And I add a "Multi-select list" field to "Test database name" database and I fill the form with:
       | Field name | Not required Multimenu |
       | Field description | Not required Multimenu |
       | Options | Option 1 |
@@ -131,7 +131,7 @@ Feature: Users can be required to specify certain fields when adding entries to
     And I press "Save"
     Then ".alert" "css_element" should exist in the "Required Checkbox" "table_row"
     And ".alert" "css_element" should exist in the "Required Two-Option Checkbox" "table_row"
-    And ".alert" "css_element" should exist in the "Required Latlong" "table_row"
+    And ".alert" "css_element" should exist in the "Required Coordinates" "table_row"
     And ".alert" "css_element" should exist in the "Required Menu" "table_row"
     And ".alert" "css_element" should exist in the "Required Number" "table_row"
     And ".alert" "css_element" should exist in the "Required Radio" "table_row"
@@ -141,7 +141,7 @@ Feature: Users can be required to specify certain fields when adding entries to
     And ".alert" "css_element" should exist in the "Required Multimenu" "table_row"
     And ".alert" "css_element" should exist in the "Required Two-Option Multimenu" "table_row"
     And ".alert" "css_element" should not exist in the "Not required Checkbox" "table_row"
-    And ".alert" "css_element" should not exist in the "Not required Latlong" "table_row"
+    And ".alert" "css_element" should not exist in the "Not required Coordinates" "table_row"
     And ".alert" "css_element" should not exist in the "Not required Menu" "table_row"
     And ".alert" "css_element" should not exist in the "Not required Number" "table_row"
     And ".alert" "css_element" should not exist in the "Not required Radio" "table_row"
@@ -220,10 +220,10 @@ Feature: Users can be required to specify certain fields when adding entries to
        | Required URL                  | http://example.com/                                       |
        | Required Multimenu            | 1                                                         |
        | Required Two-Option Multimenu | 1                                                         |
-    And I set the field with xpath "//div[@title='Not required Latlong']//tr[td/label[normalize-space(.)='Latitude']]/td/input" to "20"
+    And I set the field with xpath "//div[@title='Not required Coordinates']//tr[td/label[normalize-space(.)='Latitude']]/td/input" to "20"
     And I press "Save"
-    Then ".alert" "css_element" should exist in the "Required Latlong" "table_row"
-    And ".alert" "css_element" should exist in the "Not required Latlong" "table_row"
+    Then ".alert" "css_element" should exist in the "Required Coordinates" "table_row"
+    And ".alert" "css_element" should exist in the "Not required Coordinates" "table_row"
 
   Scenario: A student filling in number and text fields with zero will not see an error.
     Given I log in as "student1"
diff --git a/mod/feedback/lang/en/feedback.php b/mod/feedback/lang/en/feedback.php
index 3becb386500..7f753b41ad1 100644
--- a/mod/feedback/lang/en/feedback.php
+++ b/mod/feedback/lang/en/feedback.php
@@ -87,7 +87,7 @@ $string['depending_help'] = 'It is possible to show an item depending on the val
 $string['dependitem'] = 'Dependence item';
 $string['dependvalue'] = 'Dependence value';
 $string['description'] = 'Description';
-$string['do_not_analyse_empty_submits'] = 'Do not analyse empty submits';
+$string['do_not_analyse_empty_submits'] = 'Omit empty submits in analysis';
 $string['dropdown'] = 'Multiple choice - single answer allowed (drop-down menu)';
 $string['dropdownlist'] = 'Multiple choice - single answer (drop-down menu)';
 $string['dropdownrated'] = 'Drop-down menu (rated)';
diff --git a/mod/feedback/tests/behat/multichoice.feature b/mod/feedback/tests/behat/multichoice.feature
index 2cddd4a0e67..31abc53562c 100644
--- a/mod/feedback/tests/behat/multichoice.feature
+++ b/mod/feedback/tests/behat/multichoice.feature
@@ -153,7 +153,7 @@ Feature: Testing multichoice questions in feedback
     And I click on "Edit questions" "link" in the "[role=main]" "css_element"
     And I open the action menu in "//div[contains(@class, 'feedback_itemlist') and contains(.,'multichoice1')]" "xpath_element"
     And I choose "Edit question" in the open action menu
-    And I set the field "Do not analyse empty submits" to "Yes"
+    And I set the field "Omit empty submits in analysis" to "Yes"
     And I press "Save changes to question"
     And I am on the "Learning experience" "feedback activity" page
     And I navigate to "Analysis" in current page administration
@@ -293,7 +293,7 @@ Feature: Testing multichoice questions in feedback
     And I click on "Edit questions" "link" in the "[role=main]" "css_element"
     And I open the action menu in "//div[contains(@class, 'feedback_itemlist') and contains(.,'multichoice1')]" "xpath_element"
     And I choose "Edit question" in the open action menu
-    And I set the field "Do not analyse empty submits" to "Yes"
+    And I set the field "Omit empty submits in analysis" to "Yes"
     And I press "Save changes to question"
     And I am on the "Learning experience" "feedback activity" page
     And I navigate to "Analysis" in current page administration
@@ -412,7 +412,7 @@ Feature: Testing multichoice questions in feedback
     And I click on "Edit questions" "link" in the "[role=main]" "css_element"
     And I open the action menu in "//div[contains(@class, 'feedback_itemlist') and contains(.,'multichoice1')]" "xpath_element"
     And I choose "Edit question" in the open action menu
-    And I set the field "Do not analyse empty submits" to "Yes"
+    And I set the field "Omit empty submits in analysis" to "Yes"
     And I press "Save changes to question"
     And I am on the "Learning experience" "feedback activity" page
     And I navigate to "Analysis" in current page administration