diff --git a/inc/Service/Media/FallbackThumbGenerator.php b/inc/Service/Media/FallbackMediaHandler.php
similarity index 94%
rename from inc/Service/Media/FallbackThumbGenerator.php
rename to inc/Service/Media/FallbackMediaHandler.php
index c1aeacea..f1f94bf0 100644
--- a/inc/Service/Media/FallbackThumbGenerator.php
+++ b/inc/Service/Media/FallbackMediaHandler.php
@@ -4,7 +4,7 @@ namespace Vichan\Service\Media;
 use Vichan\Data\ThumbGenerationResult;
 
 
-class FallbackThumbGenerator implements ThumbGenerator {
+class FallbackMediaHandler implements MediaHandler {
 	private string $path;
 	private int $width;
 	private int $height;
diff --git a/inc/Service/Media/GdThumbGenerator.php b/inc/Service/Media/GdMediaHandler.php
similarity index 98%
rename from inc/Service/Media/GdThumbGenerator.php
rename to inc/Service/Media/GdMediaHandler.php
index 7132b867..a544ebf5 100644
--- a/inc/Service/Media/GdThumbGenerator.php
+++ b/inc/Service/Media/GdMediaHandler.php
@@ -5,7 +5,7 @@ use Vichan\Data\ThumbGenerationResult;
 use Vichan\Functions\Fs;
 
 
-class GdThumbGenerator implements ThumbGenerator {
+class GdMediaHandler implements MediaHandler {
 	private const PHP81 = \PHP_MAJOR_VERSION >= 8 && \PHP_MINOR_VERSION >= 1;
 
 	private const MIME_TO_EXT = [
diff --git a/inc/Service/Media/ThumbGenerator.php b/inc/Service/Media/MediaHandler.php
similarity index 87%
rename from inc/Service/Media/ThumbGenerator.php
rename to inc/Service/Media/MediaHandler.php
index c5d7307c..dcd935b5 100644
--- a/inc/Service/Media/ThumbGenerator.php
+++ b/inc/Service/Media/MediaHandler.php
@@ -4,7 +4,7 @@ namespace Vichan\Service\Media;
 use Vichan\Data\ThumbGenerationResult;
 
 
-interface ThumbGenerator {
+interface MediaHandler {
 	public function supportsMime(string $mime): bool;
 
 	/**
@@ -19,8 +19,7 @@ interface ThumbGenerator {
 	 * @return ThumbGenerationResult
 	 */
 	public function generateThumb(
-		string $source_file_path,
-		string $source_file_mime,
+		mixed $handle,
 		string $preferred_out_file_path,
 		string $preferred_out_mime,
 		int $max_width,