diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index bb4b9853e..59be4777e 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -784,7 +784,7 @@ protected function init()
             }
         }
 
-        $this->extend('init');
+        $this->extend('onInit');
 
         // Load the editor with original user themes before overwriting
         // them with admin themes
diff --git a/code/LeftAndMainExtension.php b/code/LeftAndMainExtension.php
index 4a2ae8310..c8f7d944a 100644
--- a/code/LeftAndMainExtension.php
+++ b/code/LeftAndMainExtension.php
@@ -26,7 +26,7 @@ public function __construct()
         parent::__construct();
     }
 
-    public function init()
+    protected function onInit()
     {
     }
 
diff --git a/tests/behat/src/Extension/CannotCreateExtension.php b/tests/behat/src/Extension/CannotCreateExtension.php
index b4836238f..53dcb4add 100644
--- a/tests/behat/src/Extension/CannotCreateExtension.php
+++ b/tests/behat/src/Extension/CannotCreateExtension.php
@@ -7,7 +7,7 @@
 
 class CannotCreateExtension extends Extension implements TestOnly
 {
-    public function canCreate()
+    protected function canCreate()
     {
         return false;
     }
diff --git a/tests/behat/src/Extension/CannotDeleteExtension.php b/tests/behat/src/Extension/CannotDeleteExtension.php
index f80c94f64..1709b437a 100644
--- a/tests/behat/src/Extension/CannotDeleteExtension.php
+++ b/tests/behat/src/Extension/CannotDeleteExtension.php
@@ -7,7 +7,7 @@
 
 class CannotDeleteExtension extends Extension implements TestOnly
 {
-    public function canDelete()
+    protected function canDelete()
     {
         return false;
     }
diff --git a/tests/behat/src/Extension/CannotEditExtension.php b/tests/behat/src/Extension/CannotEditExtension.php
index 6f9535bf4..108d793c9 100644
--- a/tests/behat/src/Extension/CannotEditExtension.php
+++ b/tests/behat/src/Extension/CannotEditExtension.php
@@ -7,7 +7,7 @@
 
 class CannotEditExtension extends Extension implements TestOnly
 {
-    public function canEdit()
+    protected function canEdit()
     {
         return false;
     }
diff --git a/tests/php/CMSProfileControllerTest/TestExtension.php b/tests/php/CMSProfileControllerTest/TestExtension.php
index be6f1347f..f6b446c54 100644
--- a/tests/php/CMSProfileControllerTest/TestExtension.php
+++ b/tests/php/CMSProfileControllerTest/TestExtension.php
@@ -6,7 +6,7 @@
 
 class TestExtension extends DataExtension
 {
-    public function canEdit($member = null)
+    protected function canEdit($member = null)
     {
         return false;
     }