diff --git a/src/data/bedrock/block/upgrade/BlockDataUpgrader.php b/src/data/bedrock/block/upgrade/BlockDataUpgrader.php
index 785a36af8a..3fae1d2413 100644
--- a/src/data/bedrock/block/upgrade/BlockDataUpgrader.php
+++ b/src/data/bedrock/block/upgrade/BlockDataUpgrader.php
@@ -30,7 +30,7 @@ use pocketmine\nbt\tag\CompoundTag;
 final class BlockDataUpgrader{
 
 	public function __construct(
-		private LegacyBlockStateMapper $legacyBlockStateMapper,
+		private BlockIdMetaUpgrader $legacyBlockStateMapper,
 		private BlockStateUpgrader $blockStateUpgrader
 	){}
 
diff --git a/src/data/bedrock/block/upgrade/LegacyBlockStateMapper.php b/src/data/bedrock/block/upgrade/BlockIdMetaUpgrader.php
similarity index 98%
rename from src/data/bedrock/block/upgrade/LegacyBlockStateMapper.php
rename to src/data/bedrock/block/upgrade/BlockIdMetaUpgrader.php
index 3b32ef15a7..3bb63a6232 100644
--- a/src/data/bedrock/block/upgrade/LegacyBlockStateMapper.php
+++ b/src/data/bedrock/block/upgrade/BlockIdMetaUpgrader.php
@@ -30,7 +30,7 @@ use pocketmine\utils\BinaryStream;
 /**
  * Handles translating legacy 1.12 block ID/meta into modern blockstates.
  */
-final class LegacyBlockStateMapper{
+final class BlockIdMetaUpgrader{
 	/**
 	 * @param BlockStateData[][] $mappingTable
 	 * @phpstan-param array<string, array<int, BlockStateData>> $mappingTable
diff --git a/src/world/format/io/GlobalBlockStateHandlers.php b/src/world/format/io/GlobalBlockStateHandlers.php
index 4cbf645d63..2ba979a66e 100644
--- a/src/world/format/io/GlobalBlockStateHandlers.php
+++ b/src/world/format/io/GlobalBlockStateHandlers.php
@@ -31,10 +31,10 @@ use pocketmine\data\bedrock\block\CachingBlockStateSerializer;
 use pocketmine\data\bedrock\block\convert\BlockObjectToBlockStateSerializer;
 use pocketmine\data\bedrock\block\convert\BlockStateToBlockObjectDeserializer;
 use pocketmine\data\bedrock\block\upgrade\BlockDataUpgrader;
+use pocketmine\data\bedrock\block\upgrade\BlockIdMetaUpgrader;
 use pocketmine\data\bedrock\block\upgrade\BlockStateUpgrader;
 use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaUtils;
 use pocketmine\data\bedrock\block\upgrade\LegacyBlockIdToStringIdMap;
-use pocketmine\data\bedrock\block\upgrade\LegacyBlockStateMapper;
 use pocketmine\errorhandler\ErrorToExceptionHandler;
 use Webmozart\PathUtil\Path;
 use function file_get_contents;
@@ -69,7 +69,7 @@ final class GlobalBlockStateHandlers{
 				BlockStateData::CURRENT_VERSION
 			));
 			self::$blockDataUpgrader = new BlockDataUpgrader(
-				LegacyBlockStateMapper::loadFromString(
+				BlockIdMetaUpgrader::loadFromString(
 					ErrorToExceptionHandler::trapAndRemoveFalse(fn() => file_get_contents(Path::join(
 						BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH,
 						'1.12.0_to_1.18.10_blockstate_map.bin'