diff --git a/app/Http/Requests/Setup/CheckDatabaseRequest.php b/app/Http/Requests/Setup/CheckDatabaseRequest.php
index 9de2aa8a3c41..f82f8e2b9425 100644
--- a/app/Http/Requests/Setup/CheckDatabaseRequest.php
+++ b/app/Http/Requests/Setup/CheckDatabaseRequest.php
@@ -34,9 +34,9 @@ class CheckDatabaseRequest extends Request
     public function rules()
     {
         return [
-            'host' => ['required'],
-            'database' => ['required'],
-            'username' => ['required'],
+            'db_host' => ['required'],
+            'db_database' => ['required'],
+            'db_username' => ['required'],
         ];
     }
 }
diff --git a/app/Http/Requests/Setup/StoreSetupRequest.php b/app/Http/Requests/Setup/StoreSetupRequest.php
index 488c729f8e14..112dde05bf90 100644
--- a/app/Http/Requests/Setup/StoreSetupRequest.php
+++ b/app/Http/Requests/Setup/StoreSetupRequest.php
@@ -31,8 +31,8 @@ class StoreSetupRequest extends Request
           /*System*/
           'url' => 'required',
           /*Database*/
-          'host' => 'required',
-          'database' => 'required',
+          'db_host' => 'required',
+          'db_database' => 'required',
           'db_username' => 'required',
           'db_password' => '',
           /*Mail driver*/
diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php
index fcd30c2fccba..f93a45324ffd 100644
--- a/app/Utils/SystemHealth.php
+++ b/app/Utils/SystemHealth.php
@@ -161,10 +161,10 @@ class SystemHealth
         $result = ['success' => false];
 
         if ($request && $request instanceof CheckDatabaseRequest) {
-            config(['database.connections.db-ninja-01.host'=> $request->input('host')]);
-            config(['database.connections.db-ninja-01.database'=> $request->input('database')]);
-            config(['database.connections.db-ninja-01.username'=> $request->input('username')]);
-            config(['database.connections.db-ninja-01.password'=> $request->input('password')]);
+            config(['database.connections.db-ninja-01.host'=> $request->input('db_host')]);
+            config(['database.connections.db-ninja-01.database'=> $request->input('db_database')]);
+            config(['database.connections.db-ninja-01.username'=> $request->input('db_username')]);
+            config(['database.connections.db-ninja-01.password'=> $request->input('db_password')]);
             config(['database.default' => 'db-ninja-01']);
 
             DB::purge('db-ninja-01');
diff --git a/resources/js/setup/setup.js b/resources/js/setup/setup.js
index e0403ae2153f..ed088045298f 100644
--- a/resources/js/setup/setup.js
+++ b/resources/js/setup/setup.js
@@ -24,10 +24,10 @@ class Setup {
 
     handleDatabaseCheck() {
         let data = {
-            host: document.querySelector('input[name="host"]').value,
-            database: document.querySelector('input[name="database"]').value,
-            username: document.querySelector('input[name="db_username"]').value,
-            password: document.querySelector('input[name="db_password"]').value,
+            db_host: document.querySelector('input[name="db_host"]').value,
+            db_database: document.querySelector('input[name="db_database"]').value,
+            db_username: document.querySelector('input[name="db_username"]').value,
+            db_password: document.querySelector('input[name="db_password"]').value,
         };
 
         Axios.post('/setup/check_db', data)
diff --git a/resources/views/setup/_database.blade.php b/resources/views/setup/_database.blade.php
index 10158fe22e13..ad9508498605 100644
--- a/resources/views/setup/_database.blade.php
+++ b/resources/views/setup/_database.blade.php
@@ -38,7 +38,7 @@ FLUSH PRIVILEGES;
                     {{ ctrans('texts.host') }}*
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="text" class="input w-full" name="host" required value="{{ old('host') ?: 'localhost'}}">
+                    <input type="text" class="input w-full" name="db_host" required value="{{ old('host') ?: 'localhost'}}">
                 </dd>
             </div>
             <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
@@ -46,7 +46,7 @@ FLUSH PRIVILEGES;
                     {{ ctrans('texts.database') }}*
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="text" class="input w-full" name="database" required value="{{ old('database') ?: 'db-ninja-01'}}">
+                    <input type="text" class="input w-full" name="db_database" required value="{{ old('database') ?: 'db-ninja-01'}}">
                 </dd>
             </div>
             <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">