diff --git a/lang/en/auth_outage.php b/lang/en/auth_outage.php
index fa167c5..7b10475 100644
--- a/lang/en/auth_outage.php
+++ b/lang/en/auth_outage.php
@@ -94,7 +94,7 @@ $string['allowedipshasmyip'] = 'Your IP (<i>{$a->ip}</i>) is in the list and you
 $string['allowedipshasntmyip'] = 'Your IP (<i>{$a->ip}</i>) is not in the list and you will be blocked out during an outage.';
 $string['allowedipsnoconfig'] = 'Your config.php does not have the extra setup to allow blocking via IP.<br />Please refer to our <a href="https://github.com/catalyst/moodle-auth_outage#installation" target="_blank">README.md</a> file for more information.';
 $string['menusettings'] = 'Settings';
-$string['menumanage'] = 'Manage';
+$string['menumanage'] = 'Manage outages';
 $string['messageoutagebackonline'] = 'We are back online!';
 $string['messageoutagebackonlinedescription'] = 'You may resume browsing safely.';
 $string['messageoutageongoing'] = 'Back online at {$a->stop}.';
diff --git a/tests/behat/default_settings.feature b/tests/behat/default_settings.feature
index d4c98dd..73d27dc 100644
--- a/tests/behat/default_settings.feature
+++ b/tests/behat/default_settings.feature
@@ -12,7 +12,7 @@ Feature: Change the default settings
     And I am an administrator
 
   Scenario Outline: Check if I can save the default settings.
-    When I navigate to "Settings" node in "Site administration > Plugins > Authentication > Outage manager"
+    When I navigate to "Plugins > Authentication > Outage manager > Settings" in site administration
     And I set the following fields to these values:
       | s_auth_outage_default_autostart           | <autostart>   |
       | s_auth_outage_default_warning_duration[v] | <warning>     |
diff --git a/tests/behat/ipblock.feature b/tests/behat/ipblock.feature
index c17d864..26d6a0e 100644
--- a/tests/behat/ipblock.feature
+++ b/tests/behat/ipblock.feature
@@ -13,7 +13,6 @@ Feature: IP Blocker
 
   Scenario: Default IP Whitelist Settings
     Given I am an administrator
-    And I am on homepage
-    When I navigate to "Settings" node in "Site administration > Plugins > Authentication > Outage manager"
+    When I navigate to "Plugins > Authentication > Outage manager > Settings" in site administration
     Then I should see "Allowed IP list"
     And I should see an empty settings text area "allowedips"
diff --git a/tests/behat/manage_outages.feature b/tests/behat/manage_outages.feature
index b7b47d7..d22db15 100644
--- a/tests/behat/manage_outages.feature
+++ b/tests/behat/manage_outages.feature
@@ -18,7 +18,7 @@ Feature: Manage outages
 
   Scenario: Check if I can navigate to management page.
     Given I am on homepage
-    When I navigate to "Manage" node in "Site administration > Plugins > Authentication > Outage manager"
+    When I navigate to "Plugins > Authentication > Outage manager > Manage outages" in site administration
     Then I should see "Planned outages"
     And I should see "No outages found." in the "#section_planned_outages" "css_element"
     And I should see "Outage history"