diff --git a/inc/Service/Media/CmdMagickImageMetadataReader.php b/inc/Service/Media/CmdMagickImageMetadataReader.php
index 80b74e1e..235046c1 100644
--- a/inc/Service/Media/CmdMagickImageMetadataReader.php
+++ b/inc/Service/Media/CmdMagickImageMetadataReader.php
@@ -1,7 +1,7 @@
 <?php
 namespace Vichan\Service\Media;
 
-use Vichan\Data\{Exif, ImageMetadataResult};
+use Vichan\Data\{Exif, ImageMetadata};
 use Vichan\Functions\Mime;
 
 
@@ -47,7 +47,7 @@ class CmdMagickImageMetadataReader implements ImageMetadataReader {
 		$this->prefix = $prefix;
 	}
 
-	public function getMetadata(string $file_path): ImageMetadataResult {
+	public function getMetadata(string $file_path): ImageMetadata {
 		$arg = \escapeshellarg("$file_path[0]");
 		$ret_exec = shell_exec_error("{$this->prefix} identify -format \"%w %h %m\" $arg");
 
@@ -65,6 +65,6 @@ class CmdMagickImageMetadataReader implements ImageMetadataReader {
 
 		$mime = Mime\ext_to_mime($ext) ?? 'application/octet-stream';
 		$exif_orientation = self::parseOrientation($orientation_str);
-		return new ImageMetadataResult($width, $height, $mime, $exif_orientation);
+		return new ImageMetadata($width, $height, $mime, $exif_orientation);
 	}
 }
diff --git a/inc/Service/Media/DefaultImageMetadataReader.php b/inc/Service/Media/DefaultImageMetadataReader.php
index dcb30898..4b989a86 100644
--- a/inc/Service/Media/DefaultImageMetadataReader.php
+++ b/inc/Service/Media/DefaultImageMetadataReader.php
@@ -2,7 +2,7 @@
 namespace Vichan\Service\Media;
 
 use Vichan\Data\Driver\Metadata\ExifReaderFactory;
-use Vichan\Data\{Exif, ImageMetadataResult};
+use Vichan\Data\{Exif, ImageMetadata};
 
 
 /**
@@ -21,7 +21,7 @@ class DefaultImageMetadataReader implements ImageMetadataReader {
 		$this->exif_reader_factory = $exif_reader_factory;
 	}
 
-	public function getMetadata(string $file_path): ImageMetadataResult {
+	public function getMetadata(string $file_path): ImageMetadata {
 		$ret = \getimagesize($file_path, $info);
 		if ($ret === false) {
 			throw new \RuntimeException("Could not read image sizes of '$file_path'");
@@ -45,6 +45,6 @@ class DefaultImageMetadataReader implements ImageMetadataReader {
 			}
 		}
 
-		return new ImageMetadataResult($width, $height, $mime, $orientation);
+		return new ImageMetadata($width, $height, $mime, $orientation);
 	}
 }
diff --git a/inc/Service/Media/ImageMetadataReader.php b/inc/Service/Media/ImageMetadataReader.php
index 0638b9b7..16f11912 100644
--- a/inc/Service/Media/ImageMetadataReader.php
+++ b/inc/Service/Media/ImageMetadataReader.php
@@ -1,12 +1,12 @@
 <?php
 namespace Vichan\Service\Media;
 
-use Vichan\Data\ImageMetadataResult;
+use Vichan\Data\ImageMetadata;
 
 
 interface ImageMetadataReader {
 	/**
 	 * @param string $file_path Image file path.
 	 */
-	public function getMetadata(string $file_path): ImageMetadataResult;
+	public function getMetadata(string $file_path): ImageMetadata;
 }