diff --git a/adminer/designs.php b/adminer/designs.php
index 4f29ee46..e309912c 100644
--- a/adminer/designs.php
+++ b/adminer/designs.php
@@ -1,12 +1,11 @@
 <?php
 function adminer_object() {
-	include_once "../plugins/plugin.php";
 	include_once "../plugins/designs.php";
 	$designs = array();
 	foreach (glob("../designs/*/*.css") as $filename) {
 		$designs[$filename] = basename(dirname($filename));
 	}
-	return new AdminerPlugin(array(
+	return new Adminer\Plugins(array(
 		new AdminerDesigns($designs),
 	));
 }
diff --git a/adminer/elastic.php b/adminer/elastic.php
index 610882a3..bc724c29 100644
--- a/adminer/elastic.php
+++ b/adminer/elastic.php
@@ -2,10 +2,9 @@
 // To create Adminer just for Elasticsearch, run `../compile.php elastic`.
 
 function adminer_object() {
-	include_once "../plugins/plugin.php";
 	include_once "../plugins/login-password-less.php";
 	include_once "../plugins/drivers/elastic.php";
-	return new AdminerPlugin(array(
+	return new Adminer\Plugins(array(
 			// TODO: inline the result of password_hash() so that the password is not visible in source codes
 			new AdminerLoginPasswordLess(password_hash("YOUR_PASSWORD_HERE", PASSWORD_DEFAULT)),
 	));
diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 5529b54a..58dddf57 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -1,7 +1,7 @@
 <?php
 namespace Adminer;
 
-// any method change in this file should be transferred to editor/include/adminer.inc.php and plugins/plugin.php
+// any method change in this file should be transferred to editor/include/adminer.inc.php and plugins.inc.php
 
 class Adminer {
 	public $operators; ///< @var list<string> operators used in select, null for all operators
diff --git a/adminer/sqlite.php b/adminer/sqlite.php
index 85687ab1..5d4ddc39 100644
--- a/adminer/sqlite.php
+++ b/adminer/sqlite.php
@@ -1,8 +1,7 @@
 <?php
 function adminer_object() {
-	include_once "../plugins/plugin.php";
 	include_once "../plugins/login-password-less.php";
-	return new AdminerPlugin(array(
+	return new Adminer\Plugins(array(
 		// TODO: inline the result of password_hash() so that the password is not visible in source codes
 		new AdminerLoginPasswordLess(password_hash("YOUR_PASSWORD_HERE", PASSWORD_DEFAULT)),
 	));
diff --git a/editor/sqlite.php b/editor/sqlite.php
index 17876d02..41b2774f 100644
--- a/editor/sqlite.php
+++ b/editor/sqlite.php
@@ -1,9 +1,8 @@
 <?php
 function adminer_object() {
-	include_once "../plugins/plugin.php";
 	include_once "../plugins/login-password-less.php";
 
-	class AdminerCustomization extends AdminerPlugin {
+	class AdminerCustomization extends Adminer\Plugins {
 		function loginFormField($name, $heading, $value) {
 			return parent::loginFormField($name, $heading, str_replace('value="server"', 'value="sqlite"', $value));
 		}