diff --git a/src/data/bedrock/block/convert/BlockObjectToBlockStateSerializer.php b/src/data/bedrock/block/convert/BlockObjectToStateSerializer.php
similarity index 99%
rename from src/data/bedrock/block/convert/BlockObjectToBlockStateSerializer.php
rename to src/data/bedrock/block/convert/BlockObjectToStateSerializer.php
index 5a8fa4bf5..23a11412d 100644
--- a/src/data/bedrock/block/convert/BlockObjectToBlockStateSerializer.php
+++ b/src/data/bedrock/block/convert/BlockObjectToStateSerializer.php
@@ -169,7 +169,7 @@ use pocketmine\utils\AssumptionFailedError;
 use function class_parents;
 use function get_class;
 
-final class BlockObjectToBlockStateSerializer implements BlockStateSerializer{
+final class BlockObjectToStateSerializer implements BlockStateSerializer{
 	/**
 	 * These callables actually accept Block, but for the sake of type completeness, it has to be never, since we can't
 	 * describe the bottom type of a type hierarchy only containing Block.
diff --git a/src/data/bedrock/block/convert/BlockStateToBlockObjectDeserializer.php b/src/data/bedrock/block/convert/BlockStateToObjectDeserializer.php
similarity index 99%
rename from src/data/bedrock/block/convert/BlockStateToBlockObjectDeserializer.php
rename to src/data/bedrock/block/convert/BlockStateToObjectDeserializer.php
index e63ee2def..f73a071e9 100644
--- a/src/data/bedrock/block/convert/BlockStateToBlockObjectDeserializer.php
+++ b/src/data/bedrock/block/convert/BlockStateToObjectDeserializer.php
@@ -54,7 +54,7 @@ use function array_key_exists;
 use function count;
 use function min;
 
-final class BlockStateToBlockObjectDeserializer implements BlockStateDeserializer{
+final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
 
 	/**
 	 * @var \Closure[]
diff --git a/src/world/format/io/GlobalBlockStateHandlers.php b/src/world/format/io/GlobalBlockStateHandlers.php
index 49924f5ed..95d36417f 100644
--- a/src/world/format/io/GlobalBlockStateHandlers.php
+++ b/src/world/format/io/GlobalBlockStateHandlers.php
@@ -25,8 +25,8 @@ namespace pocketmine\world\format\io;
 
 use pocketmine\data\bedrock\block\BlockStateData;
 use pocketmine\data\bedrock\block\BlockTypeNames;
-use pocketmine\data\bedrock\block\convert\BlockObjectToBlockStateSerializer;
-use pocketmine\data\bedrock\block\convert\BlockStateToBlockObjectDeserializer;
+use pocketmine\data\bedrock\block\convert\BlockObjectToStateSerializer;
+use pocketmine\data\bedrock\block\convert\BlockStateToObjectDeserializer;
 use pocketmine\data\bedrock\block\upgrade\BlockDataUpgrader;
 use pocketmine\data\bedrock\block\upgrade\BlockIdMetaUpgrader;
 use pocketmine\data\bedrock\block\upgrade\BlockStateUpgrader;
@@ -45,20 +45,20 @@ use const pocketmine\BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH;
  */
 final class GlobalBlockStateHandlers{
 
-	private static ?BlockObjectToBlockStateSerializer $blockStateSerializer = null;
+	private static ?BlockObjectToStateSerializer $blockStateSerializer = null;
 
-	private static ?BlockStateToBlockObjectDeserializer $blockStateDeserializer = null;
+	private static ?BlockStateToObjectDeserializer $blockStateDeserializer = null;
 
 	private static ?BlockDataUpgrader $blockDataUpgrader = null;
 
 	private static ?BlockStateData $unknownBlockStateData = null;
 
-	public static function getDeserializer() : BlockStateToBlockObjectDeserializer{
-		return self::$blockStateDeserializer ??= new BlockStateToBlockObjectDeserializer();
+	public static function getDeserializer() : BlockStateToObjectDeserializer{
+		return self::$blockStateDeserializer ??= new BlockStateToObjectDeserializer();
 	}
 
-	public static function getSerializer() : BlockObjectToBlockStateSerializer{
-		return self::$blockStateSerializer ??= new BlockObjectToBlockStateSerializer();
+	public static function getSerializer() : BlockObjectToStateSerializer{
+		return self::$blockStateSerializer ??= new BlockObjectToStateSerializer();
 	}
 
 	public static function getUpgrader() : BlockDataUpgrader{
diff --git a/tests/phpunit/data/bedrock/block/convert/BlockSerializerDeserializerTest.php b/tests/phpunit/data/bedrock/block/convert/BlockSerializerDeserializerTest.php
index 50b66ec23..f69b4d010 100644
--- a/tests/phpunit/data/bedrock/block/convert/BlockSerializerDeserializerTest.php
+++ b/tests/phpunit/data/bedrock/block/convert/BlockSerializerDeserializerTest.php
@@ -34,12 +34,12 @@ use pocketmine\data\bedrock\block\BlockStateSerializeException;
 use function print_r;
 
 final class BlockSerializerDeserializerTest extends TestCase{
-	private BlockStateToBlockObjectDeserializer $deserializer;
-	private BlockObjectToBlockStateSerializer $serializer;
+	private BlockStateToObjectDeserializer $deserializer;
+	private BlockObjectToStateSerializer $serializer;
 
 	public function setUp() : void{
-		$this->deserializer = new BlockStateToBlockObjectDeserializer();
-		$this->serializer = new BlockObjectToBlockStateSerializer();
+		$this->deserializer = new BlockStateToObjectDeserializer();
+		$this->serializer = new BlockObjectToStateSerializer();
 	}
 
 	public function testAllKnownBlockStatesSerializableAndDeserializable() : void{