diff --git a/src/Server/Http/Controllers/OAuthRegisterController.php b/src/Server/Http/Controllers/OAuthRegisterController.php
index 5a85c76..f8edcb3 100644
--- a/src/Server/Http/Controllers/OAuthRegisterController.php
+++ b/src/Server/Http/Controllers/OAuthRegisterController.php
@@ -37,7 +37,7 @@ public function __invoke(Request $request): JsonResponse
         );
 
         $client = $clients->createAuthorizationCodeGrantClient(
-            name: $request->get('name'),
+            name: $request->get('client_name', $request->get('name')),
             redirectUris: $validated['redirect_uris'],
             confidential: false,
             user: null,
diff --git a/tests/Unit/Server/RegistrarTest.php b/tests/Unit/Server/RegistrarTest.php
index a3acccc..be12b7c 100644
--- a/tests/Unit/Server/RegistrarTest.php
+++ b/tests/Unit/Server/RegistrarTest.php
@@ -166,7 +166,7 @@ public static function tokensCan($scopes) {
         eval('
             namespace Laravel\Passport;
             class ClientRepository {
-                public function createAuthorizationCodeGrantClient($name, $redirectUris, $confidential, $user, $enableDeviceFlow) {
+                public function createAuthorizationCodeGrantClient(string $name, array $redirectUris, bool $confidential = true, $user = null, bool $enableDeviceFlow = false) {
                     return (object) [
                         "id" => "test-client-id",
                         "grantTypes" => ["authorization_code"],
@@ -204,7 +204,7 @@ public function createAuthorizationCodeGrantClient($name, $redirectUris, $confid
         eval('
             namespace Laravel\Passport;
             class ClientRepository {
-                public function createAuthorizationCodeGrantClient($name, $redirectUris, $confidential, $user, $enableDeviceFlow) {
+                public function createAuthorizationCodeGrantClient(string $name, array $redirectUris, bool $confidential = true, $user = null, bool $enableDeviceFlow = false) {
                     return (object) [
                         "id" => "test-client-id",
                         "grantTypes" => ["authorization_code"],
@@ -244,7 +244,7 @@ public function createAuthorizationCodeGrantClient($name, $redirectUris, $confid
         eval('
             namespace Laravel\Passport;
             class ClientRepository {
-                public function createAuthorizationCodeGrantClient($name, $redirectUris, $confidential, $user, $enableDeviceFlow) {
+                public function createAuthorizationCodeGrantClient(string $name, array $redirectUris, bool $confidential = true, $user = null, bool $enableDeviceFlow = false) {
                     return (object) [
                         "id" => "test-client-id",
                         "grantTypes" => ["authorization_code"],