diff --git a/admin/tool/task/tests/behat/running_tasks.feature b/admin/tool/task/tests/behat/running_tasks.feature
index e5db69ced50..5725d5c51c4 100644
--- a/admin/tool/task/tests/behat/running_tasks.feature
+++ b/admin/tool/task/tests/behat/running_tasks.feature
@@ -28,13 +28,13 @@ Feature: See running scheduled tasks
     And I should see "1914" in the "Automated backups" "table_row"
 
     # Check the "asynchronous_backup_task" adhoc task details.
-    And I should see "Ad-hoc" in the "\core\task\asynchronous_backup_task" "table_row"
+    And I should see "Ad hoc" in the "\core\task\asynchronous_backup_task" "table_row"
     And I should see "2 hours" in the "core\task\asynchronous_backup_task" "table_row"
     And I should see "c69335460f7f" in the "core\task\asynchronous_backup_task" "table_row"
     And I should see "1915" in the "core\task\asynchronous_backup_task" "table_row"
 
     # Check the "asynchronous_restore_task" adhoc task details.
-    And I should see "Ad-hoc" in the "\core\task\asynchronous_restore_task" "table_row"
+    And I should see "Ad hoc" in the "\core\task\asynchronous_restore_task" "table_row"
     And I should see "2 days" in the "core\task\asynchronous_restore_task" "table_row"
     And I should see "c69335460f7f" in the "core\task\asynchronous_restore_task" "table_row"
     And I should see "1916" in the "core\task\asynchronous_restore_task" "table_row"
diff --git a/group/tests/behat/overview.feature b/group/tests/behat/overview.feature
index 04195632419..5eb8d74d156 100644
--- a/group/tests/behat/overview.feature
+++ b/group/tests/behat/overview.feature
@@ -67,8 +67,8 @@ Feature: Group overview
     # Following groups should exist in groupings.
     Then the group overview should include groups "Group 1, Group 2" in grouping "Grouping 1"
     And the group overview should include groups "Group 2,Group 3" in grouping "Grouping 2"
-    And the group overview should include groups "Group 4" in grouping "[Not in a grouping]"
-    And the group overview should include groups "No group" in grouping "[Not in a group]"
+    And the group overview should include groups "Group 4" in grouping "Not in a grouping"
+    And the group overview should include groups "No group" in grouping "Not in a group"
     # Following members should exit in group.
     And "Student 0" "text" should exist in the "Group 1" "table_row"
     And "Student 1" "text" should exist in the "Group 1" "table_row"
@@ -121,8 +121,8 @@ Feature: Group overview
     And I select "No grouping" from the "Grouping" singleselect
     And I select "All" from the "group" singleselect
     # Following groups should exist in groupings.
-    And the group overview should include groups "Group 4" in grouping "[Not in a grouping]"
-    And the group overview should include groups "No group" in grouping "[Not in a group]"
+    And the group overview should include groups "Group 4" in grouping "Not in a grouping"
+    And the group overview should include groups "No group" in grouping "Not in a group"
     # Following groups should not exits
     And "Group 1" "table_row" should not exist
     And "Group 2" "table_row" should not exist
@@ -185,7 +185,7 @@ Feature: Group overview
     And I select "All" from the "Grouping" singleselect
     And I select "No group" from the "group" singleselect
     # Following groups should exist in groupings.
-    And the group overview should include groups "No group" in grouping "[Not in a group]"
+    And the group overview should include groups "No group" in grouping "Not in a group"
     # Following groups should not exits
     And "Group 1" "table_row" should not exist
     And "Group 2" "table_row" should not exist
diff --git a/mod/feedback/tests/behat/question_types_non_anon.feature b/mod/feedback/tests/behat/question_types_non_anon.feature
index 20542740917..dbcfb606a09 100644
--- a/mod/feedback/tests/behat/question_types_non_anon.feature
+++ b/mod/feedback/tests/behat/question_types_non_anon.feature
@@ -33,7 +33,7 @@ Feature: Test creating different types of feedback questions for non-anonymous f
     And I add a "Information" question to the feedback with:
       | Question         | this is a response time question |
       | Label            | curtime                          |
-      | Information type | Responsestime                    |
+      | Information type | Responses time                   |
     And I add a "Label" question to the feedback with:
       | Contents | label text |
     And I add a "Longer text answer" question to the feedback with:
diff --git a/repository/contentbank/tests/behat/file_update.feature b/repository/contentbank/tests/behat/file_update.feature
index 96cb40a40d5..fbd7629fc97 100644
--- a/repository/contentbank/tests/behat/file_update.feature
+++ b/repository/contentbank/tests/behat/file_update.feature
@@ -27,7 +27,7 @@ Feature: Updating a file in the content bank after using in a course
     And I click on "Browse repositories..." "button" in the "Insert H5P" "dialogue"
     And I select "Content bank" repository in file picker
     And I click on "package.h5p" "file" in repository content area
-    And I click on "Create an alias/shortcut to the file" "radio"
+    And I click on "Link to the file" "radio"
     And I click on "Select this file" "button"
     And I click on "Insert H5P" "button" in the "Insert H5P" "dialogue"
     And I wait until the page is ready
diff --git a/repository/tests/behat/create_shortcut.feature b/repository/tests/behat/create_shortcut.feature
index 1cac3cbc3b2..71f07a5f2a3 100644
--- a/repository/tests/behat/create_shortcut.feature
+++ b/repository/tests/behat/create_shortcut.feature
@@ -31,7 +31,7 @@ Feature: Create shortcuts
     And ".fp-content .fp-file.fp-isreference" "css_element" should not exist
     And I add "empty.txt" file from "Private files" to "Files" filemanager as:
       | Save as | empty_ref.txt |
-      | Create an alias/shortcut to the file | 1 |
+      | Link to the file | 1 |
     And I should see "2" elements in "Files" filemanager
     And I should see "empty_ref.txt" in the ".fp-content .fp-file.fp-isreference" "css_element"
     And I press "Save and display"
@@ -54,7 +54,7 @@ Feature: Create shortcuts
     # ------ Overwriting non-reference with a reference ---------
     And I add and overwrite "empty.txt" file from "Private files" to "Files" filemanager as:
       | Save as | empty_ref.txt |
-      | Create an alias/shortcut to the file | 1 |
+      | Link to the file | 1 |
     And I should see "2" elements in "Files" filemanager
     And I should see "empty_ref.txt" in the ".fp-content .fp-file.fp-isreference" "css_element"
     And I press "Save changes"