diff --git a/cli/ratchet/data.php b/cli/ratchet/data.php
index c82276e1..7ae8c183 100644
--- a/cli/ratchet/data.php
+++ b/cli/ratchet/data.php
@@ -5,8 +5,8 @@
 use ChessServer\Command\Parser;
 use ChessServer\Command\Data\Cli;
 use ChessServer\Command\Data\Db;
+use ChessServer\Socket\Ratchet\ClientStorage;
 use ChessServer\Socket\Ratchet\DataWebSocket;
-use ChessServer\Socket\Ratchet\TextClientStorage;
 use Dotenv\Dotenv;
 use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
@@ -36,7 +36,7 @@
 
 $parser = new Parser(new Cli($db));
 
-$clientStorage = new TextClientStorage($logger);
+$clientStorage = new ClientStorage($logger);
 
 $webSocket = (new DataWebSocket($parser))->init($clientStorage);
 
diff --git a/cli/ratchet/game.php b/cli/ratchet/game.php
index e23aa60f..0cd3b835 100644
--- a/cli/ratchet/game.php
+++ b/cli/ratchet/game.php
@@ -4,8 +4,8 @@
 
 use ChessServer\Command\Parser;
 use ChessServer\Command\Game\Cli;
+use ChessServer\Socket\Ratchet\ClientStorage;
 use ChessServer\Socket\Ratchet\GameWebSocket;
-use ChessServer\Socket\Ratchet\TextClientStorage;
 use Dotenv\Dotenv;
 use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
@@ -25,7 +25,7 @@
 $logger = new Logger('log');
 $logger->pushHandler(new StreamHandler(__DIR__.'/../../storage' . '/game.log', Logger::INFO));
 
-$clientStorage = new TextClientStorage($logger);
+$clientStorage = new ClientStorage($logger);
 
 $parser = new Parser(new Cli());
 
diff --git a/cli/ratchet/ws_game.php b/cli/ratchet/ws_game.php
index 7623c5bc..db5a05c2 100644
--- a/cli/ratchet/ws_game.php
+++ b/cli/ratchet/ws_game.php
@@ -4,8 +4,8 @@
 
 use ChessServer\Command\Parser;
 use ChessServer\Command\Game\Cli;
+use ChessServer\Socket\Ratchet\ClientStorage;
 use ChessServer\Socket\Ratchet\GameWebSocket;
-use ChessServer\Socket\Ratchet\TextClientStorage;
 use Dotenv\Dotenv;
 use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
@@ -22,7 +22,7 @@
 $logger = new Logger('log');
 $logger->pushHandler(new StreamHandler(__DIR__.'/../../storage' . '/game.log', Logger::INFO));
 
-$clientStorage = new TextClientStorage($logger);
+$clientStorage = new ClientStorage($logger);
 
 $parser = new Parser(new Cli());
 
diff --git a/cli/workerman/binary.php b/cli/workerman/binary.php
index aac7f543..29b870de 100644
--- a/cli/workerman/binary.php
+++ b/cli/workerman/binary.php
@@ -4,8 +4,8 @@
 
 use ChessServer\Command\Parser;
 use ChessServer\Command\Binary\Cli;
+use ChessServer\Socket\Workerman\ClientStorage;
 use ChessServer\Socket\Workerman\BinaryWebSocket;
-use ChessServer\Socket\Workerman\TextClientStorage;
 use Dotenv\Dotenv;
 use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
@@ -20,7 +20,7 @@
 
 $parser = new Parser(new Cli());
 
-$clientStorage = new TextClientStorage($logger);
+$clientStorage = new ClientStorage($logger);
 
 $socketName = "websocket://{$_ENV['WSS_ADDRESS']}:{$_ENV['WSS_BINARY_PORT']}";
 
diff --git a/cli/workerman/data.php b/cli/workerman/data.php
index b998da3e..3bacad87 100644
--- a/cli/workerman/data.php
+++ b/cli/workerman/data.php
@@ -5,8 +5,8 @@
 use ChessServer\Command\Parser;
 use ChessServer\Command\Data\Cli;
 use ChessServer\Command\Data\Db;
+use ChessServer\Socket\Workerman\ClientStorage;
 use ChessServer\Socket\Workerman\DataWebSocket;
-use ChessServer\Socket\Workerman\TextClientStorage;
 use Dotenv\Dotenv;
 use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
@@ -29,7 +29,7 @@
 
 $parser = new Parser(new Cli($db));
 
-$clientStorage = new TextClientStorage($logger);
+$clientStorage = new ClientStorage($logger);
 
 $socketName = "websocket://{$_ENV['WSS_ADDRESS']}:{$_ENV['WSS_DATA_PORT']}";
 
diff --git a/cli/workerman/game.php b/cli/workerman/game.php
index b7e8a294..f5b7e78a 100644
--- a/cli/workerman/game.php
+++ b/cli/workerman/game.php
@@ -4,8 +4,8 @@
 
 use ChessServer\Command\Parser;
 use ChessServer\Command\Game\Cli;
+use ChessServer\Socket\Workerman\ClientStorage;
 use ChessServer\Socket\Workerman\GameWebSocket;
-use ChessServer\Socket\Workerman\TextClientStorage;
 use Dotenv\Dotenv;
 use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
@@ -20,7 +20,7 @@
 
 $parser = new Parser(new Cli());
 
-$clientStorage = new TextClientStorage($logger);
+$clientStorage = new ClientStorage($logger);
 
 $socketName = "websocket://{$_ENV['WSS_ADDRESS']}:{$_ENV['WSS_GAME_PORT']}";
 
diff --git a/src/Socket/Ratchet/TextClientStorage.php b/src/Socket/Ratchet/ClientStorage.php
similarity index 95%
rename from src/Socket/Ratchet/TextClientStorage.php
rename to src/Socket/Ratchet/ClientStorage.php
index 3869938a..b4cfcc2e 100644
--- a/src/Socket/Ratchet/TextClientStorage.php
+++ b/src/Socket/Ratchet/ClientStorage.php
@@ -5,7 +5,7 @@
 use ChessServer\Socket\ClientStorageInterface;
 use Monolog\Logger;
 
-class TextClientStorage extends \SplObjectStorage implements ClientStorageInterface
+class ClientStorage extends \SplObjectStorage implements ClientStorageInterface
 {
     private Logger $logger;
 
diff --git a/src/Socket/Workerman/TextClientStorage.php b/src/Socket/Workerman/ClientStorage.php
similarity index 95%
rename from src/Socket/Workerman/TextClientStorage.php
rename to src/Socket/Workerman/ClientStorage.php
index 15c5015f..3cdf36ff 100644
--- a/src/Socket/Workerman/TextClientStorage.php
+++ b/src/Socket/Workerman/ClientStorage.php
@@ -5,7 +5,7 @@
 use ChessServer\Socket\ClientStorageInterface;
 use Monolog\Logger;
 
-class TextClientStorage extends \SplObjectStorage implements ClientStorageInterface
+class ClientStorage extends \SplObjectStorage implements ClientStorageInterface
 {
     private Logger $logger;