3 files changed, 11 insertions, 6 deletions
diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php
index 61e9c8ac6..c50605095 100644
--- a/lib/plugins/acl/action.php
+++ b/lib/plugins/acl/action.php
@@ -1,15 +1,18 @@
 <?php
+
+use dokuwiki\Extension\ActionPlugin;
+use dokuwiki\Extension\EventHandler;
+use dokuwiki\Extension\Event;
 /**
  * AJAX call handler for ACL plugin
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
-
 /**
  * Register handler
  */
-class action_plugin_acl extends DokuWiki_Action_Plugin
+class action_plugin_acl extends ActionPlugin
 {
 
     /**
@@ -18,7 +21,7 @@ class action_plugin_acl extends DokuWiki_Action_Plugin
      * @param Doku_Event_Handler $controller DokuWiki's event controller object
      * @return void
      */
-    public function register(Doku_Event_Handler $controller)
+    public function register(EventHandler $controller)
     {
 
         $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handleAjaxCallAcl');
@@ -31,7 +34,7 @@ class action_plugin_acl extends DokuWiki_Action_Plugin
      * @param mixed $param  empty
      * @return void
      */
-    public function handleAjaxCallAcl(Doku_Event $event, $param)
+    public function handleAjaxCallAcl(Event $event, $param)
     {
         if ($event->data !== 'plugin_acl') {
             return;
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index bde20dd6b..4213c4e53 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -1,4 +1,5 @@
 <?php
+use dokuwiki\Extension\AdminPlugin;
 use dokuwiki\Utf8\Sort;
 
 /**
@@ -14,7 +15,7 @@ use dokuwiki\Utf8\Sort;
  * All DokuWiki plugins to extend the admin function
  * need to inherit from this class
  */
-class admin_plugin_acl extends DokuWiki_Admin_Plugin
+class admin_plugin_acl extends AdminPlugin
 {
     public $acl;
     protected $ns;
diff --git a/lib/plugins/acl/remote.php b/lib/plugins/acl/remote.php
index 1f7e0055f..ccf8f312c 100644
--- a/lib/plugins/acl/remote.php
+++ b/lib/plugins/acl/remote.php
@@ -1,11 +1,12 @@
 <?php
 
+use dokuwiki\Extension\RemotePlugin;
 use dokuwiki\Remote\AccessDeniedException;
 
 /**
  * Class remote_plugin_acl
  */
-class remote_plugin_acl extends DokuWiki_Remote_Plugin
+class remote_plugin_acl extends RemotePlugin
 {
 
     /**