diff --git a/src/Server.php b/src/Server.php
index 7b3496dd2..cb6958c92 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -30,7 +30,7 @@ namespace pocketmine;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\SimpleCommandMap;
-use pocketmine\console\CommandReaderThread;
+use pocketmine\console\ConsoleReaderThread;
 use pocketmine\console\ConsoleCommandSender;
 use pocketmine\crafting\CraftingManager;
 use pocketmine\crafting\CraftingManagerFromDataHelper;
@@ -227,7 +227,7 @@ class Server{
 	/** @var MemoryManager */
 	private $memoryManager;
 
-	/** @var CommandReaderThread */
+	/** @var ConsoleReaderThread */
 	private $console;
 
 	/** @var SimpleCommandMap */
@@ -1130,7 +1130,7 @@ class Server{
 
 			$consoleNotifier = new SleeperNotifier();
 			$commandBuffer = new \Threaded();
-			$this->console = new CommandReaderThread($commandBuffer, $consoleNotifier);
+			$this->console = new ConsoleReaderThread($commandBuffer, $consoleNotifier);
 			$this->tickSleeper->addNotifier($consoleNotifier, function() use ($commandBuffer, $consoleSender) : void{
 				Timings::$serverCommand->startTiming();
 				while(($line = $commandBuffer->shift()) !== null){
@@ -1419,7 +1419,7 @@ class Server{
 				$this->configGroup->save();
 			}
 
-			if($this->console instanceof CommandReaderThread){
+			if($this->console instanceof ConsoleReaderThread){
 				$this->getLogger()->debug("Closing console");
 				$this->console->shutdown();
 				$this->console->notify();
diff --git a/src/console/CommandReader.php b/src/console/ConsoleReader.php
similarity index 98%
rename from src/console/CommandReader.php
rename to src/console/ConsoleReader.php
index ce10c587d..9da61cb6d 100644
--- a/src/console/CommandReader.php
+++ b/src/console/ConsoleReader.php
@@ -31,7 +31,7 @@ use function stream_select;
 use function trim;
 use function usleep;
 
-final class CommandReader{
+final class ConsoleReader{
 	/** @var resource */
 	private $stdin;
 
diff --git a/src/console/CommandReaderThread.php b/src/console/ConsoleReaderThread.php
similarity index 96%
rename from src/console/CommandReaderThread.php
rename to src/console/ConsoleReaderThread.php
index 4bcd99305..accc6a839 100644
--- a/src/console/CommandReaderThread.php
+++ b/src/console/ConsoleReaderThread.php
@@ -30,7 +30,7 @@ use function microtime;
 use function preg_replace;
 use function usleep;
 
-final class CommandReaderThread extends Thread{
+final class ConsoleReaderThread extends Thread{
 	private \Threaded $buffer;
 	private ?SleeperNotifier $notifier;
 
@@ -63,7 +63,7 @@ final class CommandReaderThread extends Thread{
 		$buffer = $this->buffer;
 		$notifier = $this->notifier;
 
-		$reader = new CommandReader();
+		$reader = new ConsoleReader();
 		while(!$this->shutdown){
 			$line = $reader->readLine();
 
diff --git a/tests/phpstan/configs/actual-problems.neon b/tests/phpstan/configs/actual-problems.neon
index e01519bff..06987c93c 100644
--- a/tests/phpstan/configs/actual-problems.neon
+++ b/tests/phpstan/configs/actual-problems.neon
@@ -6,7 +6,7 @@ parameters:
 			path: ../../../src/CrashDump.php
 
 		-
-			message: "#^Instanceof between pocketmine\\\\console\\\\CommandReaderThread and pocketmine\\\\console\\\\CommandReaderThread will always evaluate to true\\.$#"
+			message: "#^Instanceof between pocketmine\\\\console\\\\ConsoleReaderThread and pocketmine\\\\console\\\\ConsoleReaderThread will always evaluate to true\\.$#"
 			count: 1
 			path: ../../../src/Server.php
 
diff --git a/tests/phpstan/configs/l7-baseline.neon b/tests/phpstan/configs/l7-baseline.neon
index cec2e9a22..a9eb81028 100644
--- a/tests/phpstan/configs/l7-baseline.neon
+++ b/tests/phpstan/configs/l7-baseline.neon
@@ -436,9 +436,9 @@ parameters:
 			path: ../../../src/block/tile/TileFactory.php
 
 		-
-			message: "#^Property pocketmine\\\\console\\\\CommandReader\\:\\:\\$stdin \\(resource\\) does not accept resource\\|false\\.$#"
+			message: "#^Property pocketmine\\\\console\\\\ConsoleReader\\:\\:\\$stdin \\(resource\\) does not accept resource\\|false\\.$#"
 			count: 1
-			path: ../../../src/console/CommandReader.php
+			path: ../../../src/console/ConsoleReader.php
 
 		-
 			message: "#^Only booleans are allowed in an if condition, int\\|false given\\.$#"
diff --git a/tests/phpstan/configs/phpstan-bugs.neon b/tests/phpstan/configs/phpstan-bugs.neon
index 215140dba..7d2210986 100644
--- a/tests/phpstan/configs/phpstan-bugs.neon
+++ b/tests/phpstan/configs/phpstan-bugs.neon
@@ -3,7 +3,7 @@ parameters:
 		-
 			message: "#^Call to function is_resource\\(\\) with resource will always evaluate to true\\.$#"
 			count: 2
-			path: ../../../src/console/CommandReader.php
+			path: ../../../src/console/ConsoleReader.php
 
 		-
 			message: "#^Method pocketmine\\\\crafting\\\\CraftingManager\\:\\:getDestructorCallbacks\\(\\) should return pocketmine\\\\utils\\\\ObjectSet\\<Closure\\(\\)\\: void\\> but returns pocketmine\\\\utils\\\\ObjectSet\\<Closure\\(\\)\\: void\\>\\|pocketmine\\\\utils\\\\ObjectSet\\<object\\>\\.$#"