diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3bcd07d..ccf01f0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-Adminer 4.13 (2025-01-23)
+AdminerNeo 4.13 (2025-01-23)
 -------------------------
 
 ### Changes
@@ -16,7 +16,7 @@ Adminer 4.13 (2025-01-23)
 - SQLite: Fix exporting and recreating tables with UNIQUE column constraint
 - Fix main visual glitches in designs
 
-Adminer 4.12 (2024-11-21)
+AdminerNeo 4.12 (2024-11-21)
 -------------------------
 
 ### New features
@@ -46,7 +46,7 @@ Adminer 4.12 (2024-11-21)
 - Compiler: Fix translations in plugins
 - Compiler: Fix compiled SQLite single-driver Adminer
 
-Adminer 4.11 (2024-10-30)
+AdminerNeo 4.11 (2024-10-30)
 -------------------------
 
 ### New features
@@ -69,7 +69,7 @@ Adminer 4.11 (2024-10-30)
 - MS SQL: Prefix Unicode strings with 'N' so they are treated correctly
 - Fix printing error message while validating server URL
 
-Adminer 4.10 (2024-10-22)
+AdminerNeo 4.10 (2024-10-22)
 -------------------------
 
 ### New features
@@ -102,7 +102,7 @@ Adminer 4.10 (2024-10-22)
 
 - Fix missing SQL statement if warnings are printed (regression from 4.9)
 
-Adminer 4.9.4 (2024-10-09)
+AdminerNeo 4.9.4 (2024-10-09)
 --------------------------
 
 - Fix the width of inline edit field
@@ -115,7 +115,7 @@ Adminer 4.9.4 (2024-10-09)
 - Editor: Fix building links with array parameters
 - Clean up the code for PHP < 5.6
 
-Adminer 4.9.3 (2024-10-02)
+AdminerNeo 4.9.3 (2024-10-02)
 --------------------------
 
 - MySQL, PostgreSQL: Fix queries splitting and string constants
@@ -131,7 +131,7 @@ Adminer 4.9.3 (2024-10-02)
 - CSS: Fix background color of `<pre>` used as edit field
 - CSS: Bigger font size for code blocks
 
-Adminer 4.9.2 (2024-09-18)
+AdminerNeo 4.9.2 (2024-09-18)
 --------------------------
 
 - Fix textarea height for single-line inputs (used typically for SQLite text field)
@@ -145,7 +145,7 @@ Adminer 4.9.2 (2024-09-18)
 - Editor: Fix searching in tables
 - Add function to retrieve driver name that can be used in plugins (by @Roy-Orbison)
 
-Adminer 4.9.1 (2024-09-09)
+AdminerNeo 4.9.1 (2024-09-09)
 --------------------------
 
 - Compatibility with PHP 8.3 (by @Sneda8)
@@ -163,7 +163,7 @@ Adminer 4.9.1 (2024-09-09)
 - AdminerEditForeign: Refactor and fix the plugin
 - AdminerLoginOtp: Autocomplete hints for OTP input field, code refactoring
 
-Adminer 4.9 (2024-08-19)
+AdminerNeo 4.9 (2024-08-19)
 ------------------------
 
 - Validate server input in login form
@@ -181,7 +181,7 @@ Adminer 4.9 (2024-08-19)
 - Update composer.json
 - Add script for exporting compiled adminer variants
 
-Adminer 4.8.2 (2024-03-16)
+AdminerNeo 4.8.2 (2024-03-16)
 --------------------------
 
 - Support multi-line table comments
diff --git a/LICENSE.md b/LICENSE.md
index 7f03b915..3705d44f 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,7 +1,7 @@
 Licenses
 ========
 
-You may use Adminer under the terms of either the Apache License Version 2.0 
+You may use AdminerNeo under the terms of either the Apache License Version 2.0 
 or the GNU General Public License (GPL) version 2.
 
 - [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0)
diff --git a/README.md b/README.md
index 3cd8be98..0328723c 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,22 @@
-Adminer
-=======
+AdminerNeo
+==========
 
-**Adminer** is a full-featured database management tool written in PHP. It consists of a single file ready to deploy to 
-the target server. As a companion, **Adminer Editor** offers data manipulation for end-users.
+**AdminerNeo** is a full-featured database management tool written in PHP. It consists of a single file ready to deploy 
+to the target server. As a companion, **AdminerNeo Editor** offers data manipulation for end-users. 
 
 Supported database drivers:
 - MySQL, MariaDB, PostgreSQL, SQLite, MS SQL, Oracle, MongoDB
 - With plugin: SimpleDB, Elasticsearch (beta), Firebird (alpha), ClickHouse (alpha)
 
+AdminerNeo is based on the [Adminer](https://www.adminer.org/) project by Jakub Vrána.
+
 Requirements
 ------------
 
 - PHP 5.6+ with enabled sessions.
 
-Migration from original Adminer
--------------------------------
+Migration from Adminer
+----------------------
 
 - Remove plugin AdminerTablesFilter (plugins/tables-filter.php).
 - If you use complex custom theme, you will probably need to adjust a thing or two.
@@ -28,17 +30,17 @@ Usage
 
 Download one for the latest [release files](https://github.com/pematon/adminer/releases), upload to the HTTP server 
 with PHP and enjoy 😉 If you are not satisfied with any combination of the database driver and language, you can 
-download the source code and compile your own Adminer:
+download the source code and compile your own AdminerNeo:
 
 - Download the source code.
 - Run `composer install` to install dependencies.
 - Run compile.php:
 
 ```shell
-# Adminer
+# AdminerNeo
 php compile.php <drivers> <languages>
 
-# Editor
+# AdminerNeo Editor
 php compile.php editor <drivers> <languages>
 ```
 
@@ -54,8 +56,8 @@ php compile.php mysql,pgsql en,de,cs,sk
 Security
 --------
 
-Adminer does not allow connecting to databases without a password and it rate-limits the connection attempts to protect 
-against brute-force attacks. Still, it is highly recommended to 🔒 **restrict access to Adminer** 🔒 by whitelisting IP 
+AdminerNeo does not allow connecting to databases without a password and it rate-limits the connection attempts to protect 
+against brute-force attacks. Still, it is highly recommended to 🔒 **restrict access to AdminerNeo** 🔒 by whitelisting IP 
 addresses allowed to connect to it, by password-protecting the access in your web server or by enabling security plugins 
 (e.g. to require an OTP).
 
@@ -119,14 +121,14 @@ include "./adminer.php";
 Main project files
 ------------------
 
-- adminer/index.php - Run development version of Adminer.
-- editor/index.php - Run development version of Adminer Editor.
+- adminer/index.php - Run development version of AdminerNeo.
+- editor/index.php - Run development version of AdminerNeo Editor.
 - editor/example.php - Example customization.
-- plugins/readme.txt - Plugins for Adminer and Adminer Editor.
+- plugins/readme.txt - Plugins for AdminerNeo and AdminerNeo Editor.
 - adminer/plugin.php - Plugin demo.
-- adminer/sqlite.php - Development version of Adminer with SQLite allowed.
+- adminer/sqlite.php - Development version of AdminerNeo with SQLite allowed.
 - editor/sqlite.php - Development version of Editor with SQLite allowed.
-- adminer/designs.php - Development version of Adminer with adminer.css switcher.
+- adminer/designs.php - Development version of AdminerNeo with adminer.css switcher.
 - compile.php - Create a single file version.
 - lang.php - Update translations.
 - tests/katalon.html - Katalon Automation Recorder test suite.
@@ -134,7 +136,7 @@ Main project files
 Project history
 ---------------
 
-Adminer was originally developed by Jakub Vrana, and it can be still found on [official pages](https://www.adminer.org/).
+Adminer was originally developed by Jakub Vrána, and it can be still found on [official pages](https://www.adminer.org/).
 Unfortunately, it is not maintained for several years. In the meantime, I (@peterpp) created for my company a set of
 custom plugins, modern theme, fixed some bugs and practically rewrote the Elasticsearch driver. I also looked closely 
 and contributed to the [AdminerEvo](https://www.adminerevo.org/) project that looked promising. However, I finally 
@@ -144,7 +146,7 @@ What to expect
 --------------
 
 Our top priority is fixing the security issues and reported bugs. But we really want to move forward and transform
-Adminer to a tool that will keep its simplicity, yet looks much better, is even easier to use and can be configured
+AdminerNeo to a tool that will keep its simplicity, yet looks much better, is even easier to use and can be configured
 without requirement of additional plugins.
 
 ### Version 4.x
@@ -165,6 +167,3 @@ support dark mode, configurable color variants for production/devel environment.
 - **Plugins** - Integrate several basic plugins, enable them by optional configuration.
 - **Codebase** - Prefer code readability before minimalism, use PER coding style, add namespaces.
 - **Compilation** - Allow to export selected drivers, themes, languages and plugins into a single adminer.php file.
-
-We are also thinking to change the project's name, so people will clearly distinguish between original Adminer and 
-other forks. Any suggestions are welcome.
diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 355e2f64..951d92a2 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -13,7 +13,7 @@ class Adminer {
 	* @return string HTML code
 	*/
 	function name() {
-		return "<a id='h1' href='" . h(HOME_URL) . "'>Adminer</a>";
+		return "<a id='h1' href='" . h(HOME_URL) . "'>AdminerNeo</a>";
 	}
 
 	/** Connection parameters
diff --git a/composer.json b/composer.json
index a5266df8..64af55dd 100644
--- a/composer.json
+++ b/composer.json
@@ -1,22 +1,22 @@
 {
-    "name": "pematon/adminer",
+    "name": "adminerneo/adminerneo",
     "description": "Database management in a single PHP file.",
-    "homepage": "https://github.com/pematon/adminer",
+    "homepage": "https://github.com/adminerneo/adminerneo",
     "keywords": [
         "database"
     ],
     "support": {
-        "issues": "https://github.com/pematon/adminer/issues",
-        "forum": "https://github.com/pematon/adminer/discussions",
-        "source": "https://github.com/pematon/adminer"
+        "issues": "https://github.com/adminerneo/adminerneo/issues",
+        "forum": "https://github.com/adminerneo/adminerneo/discussions",
+        "source": "https://github.com/adminerneo/adminerneo"
     },
     "authors": [
         {
-            "name": "Jakub Vrána",
-            "homepage": "https://www.vrana.cz/"
+            "name": "Peter Knut"
         },
         {
-            "name": "Peter Knut"
+            "name": "Jakub Vrána",
+            "homepage": "https://www.vrana.cz/"
         }
     ],
     "autoload": {
@@ -61,7 +61,7 @@
     "repositories": [
         {
             "type": "vcs",
-            "url": "https://github.com/pematon/jush.git"
+            "url": "https://github.com/peterpp/jush.git"
         },
         {
             "type": "vcs",
diff --git a/logo.png b/logo.png
new file mode 100644
index 00000000..035656f6
Binary files /dev/null and b/logo.png differ