diff --git a/module/CLI/test/Command/Api/ListKeysCommandTest.php b/module/CLI/test/Command/Api/ListKeysCommandTest.php
index 54ce19bc..0e806e87 100644
--- a/module/CLI/test/Command/Api/ListKeysCommandTest.php
+++ b/module/CLI/test/Command/Api/ListKeysCommandTest.php
@@ -105,21 +105,21 @@ class ListKeysCommandTest extends TestCase
         ];
         yield 'with names' => [
             [
-                ApiKey::withKey('abc', null, 'Alice'),
-                ApiKey::withKey('def', null, 'Alice and Bob'),
-                ApiKey::withKey('ghi', null, ''),
-                ApiKey::withKey('jkl', null, null),
+                $apiKey1 = ApiKey::withName('Alice'),
+                $apiKey2 = ApiKey::withName('Alice and Bob'),
+                $apiKey3 = ApiKey::withName(''),
+                $apiKey4 = new ApiKey(),
             ],
             true,
             <<<OUTPUT
-            +-----+---------------+-----------------+-------+
-            | Key | Name          | Expiration date | Roles |
-            +-----+---------------+-----------------+-------+
-            | abc | Alice         | -               | Admin |
-            | def | Alice and Bob | -               | Admin |
-            | ghi |               | -               | Admin |
-            | jkl | -             | -               | Admin |
-            +-----+---------------+-----------------+-------+
+            +--------------------------------------+---------------+-----------------+-------+
+            | Key                                  | Name          | Expiration date | Roles |
+            +--------------------------------------+---------------+-----------------+-------+
+            | {$apiKey1} | Alice         | -               | Admin |
+            | {$apiKey2} | Alice and Bob | -               | Admin |
+            | {$apiKey3} |               | -               | Admin |
+            | {$apiKey4} | -             | -               | Admin |
+            +--------------------------------------+---------------+-----------------+-------+
 
             OUTPUT,
         ];
diff --git a/module/Rest/src/ApiKey/Model/ApiKeyMeta.php b/module/Rest/src/ApiKey/Model/ApiKeyMeta.php
new file mode 100644
index 00000000..b79b9adf
--- /dev/null
+++ b/module/Rest/src/ApiKey/Model/ApiKeyMeta.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Rest\ApiKey\Model;
+
+final class ApiKeyMeta
+{
+    public static function withKey(string $key): self
+    {
+
+    }
+
+    public static function withName(string $key): self
+    {
+
+    }
+}
diff --git a/module/Rest/src/Entity/ApiKey.php b/module/Rest/src/Entity/ApiKey.php
index b475a69d..e15c59f8 100644
--- a/module/Rest/src/Entity/ApiKey.php
+++ b/module/Rest/src/Entity/ApiKey.php
@@ -55,6 +55,11 @@ class ApiKey extends AbstractEntity
         return $apiKey;
     }
 
+    public static function withName(string $name): self
+    {
+        return new self(null, $name);
+    }
+
     public function getExpirationDate(): ?Chronos
     {
         return $this->expirationDate;