diff --git a/src/Drivers/Gd/ImageFactory.php b/src/Drivers/Gd/Factory.php
similarity index 93%
rename from src/Drivers/Gd/ImageFactory.php
rename to src/Drivers/Gd/Factory.php
index b1cf1ed0..0df41869 100644
--- a/src/Drivers/Gd/ImageFactory.php
+++ b/src/Drivers/Gd/Factory.php
@@ -9,7 +9,7 @@ use Intervention\Image\Interfaces\FactoryInterface;
 use Intervention\Image\Interfaces\ImageInterface;
 use Intervention\Image\Traits\CanHandleInput;
 
-class ImageFactory implements FactoryInterface
+class Factory implements FactoryInterface
 {
     use CanHandleInput;
 
@@ -36,7 +36,7 @@ class ImageFactory implements FactoryInterface
     {
         $frames = new Collection();
 
-        $animation = new class ($frames) extends ImageFactory
+        $animation = new class ($frames) extends Factory
         {
             public function __construct(public Collection $frames)
             {
diff --git a/src/Drivers/Imagick/ImageFactory.php b/src/Drivers/Imagick/Factory.php
similarity index 94%
rename from src/Drivers/Imagick/ImageFactory.php
rename to src/Drivers/Imagick/Factory.php
index c0f754a2..e4161bab 100644
--- a/src/Drivers/Imagick/ImageFactory.php
+++ b/src/Drivers/Imagick/Factory.php
@@ -10,7 +10,7 @@ use Intervention\Image\Interfaces\ImageInterface;
 use Intervention\Image\Traits\CanCheckType;
 use Intervention\Image\Traits\CanHandleInput;
 
-class ImageFactory implements FactoryInterface
+class Factory implements FactoryInterface
 {
     use CanHandleInput;
     use CanCheckType;
@@ -35,7 +35,7 @@ class ImageFactory implements FactoryInterface
         $imagick = new Imagick();
         $imagick->setFormat('gif');
 
-        $animation = new class ($imagick) extends ImageFactory
+        $animation = new class ($imagick) extends Factory
         {
             public function __construct(public Imagick $imagick)
             {
diff --git a/src/ImageManager.php b/src/ImageManager.php
index 9a682328..a8ad8ab8 100644
--- a/src/ImageManager.php
+++ b/src/ImageManager.php
@@ -68,7 +68,7 @@ class ImageManager
      */
     public function create(int $width, int $height): ImageInterface
     {
-        return $this->resolveDriverClass('ImageFactory')->newImage($width, $height);
+        return $this->resolveDriverClass('Factory')->newImage($width, $height);
     }
 
     /**
@@ -79,7 +79,7 @@ class ImageManager
      */
     public function animate(callable $callback): ImageInterface
     {
-        return $this->resolveDriverClass('ImageFactory')->newAnimation($callback);
+        return $this->resolveDriverClass('Factory')->newAnimation($callback);
     }
 
     /**
diff --git a/src/Traits/CanBuildNewImage.php b/src/Traits/CanBuildNewImage.php
index fe67f5d2..182db97f 100644
--- a/src/Traits/CanBuildNewImage.php
+++ b/src/Traits/CanBuildNewImage.php
@@ -10,6 +10,6 @@ trait CanBuildNewImage
 
     public function imageFactory(): FactoryInterface
     {
-        return $this->resolveDriverClass('ImageFactory');
+        return $this->resolveDriverClass('Factory');
     }
 }
diff --git a/tests/Drivers/Abstract/Modifiers/AbstractFitModifierTest.php b/tests/Drivers/Abstract/Modifiers/AbstractFitModifierTest.php
index 2de82ad4..64262e3c 100644
--- a/tests/Drivers/Abstract/Modifiers/AbstractFitModifierTest.php
+++ b/tests/Drivers/Abstract/Modifiers/AbstractFitModifierTest.php
@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Intervention\Image\Tests\Drivers\Abstract\Modifiers;
 
 use Intervention\Image\Drivers\Abstract\Modifiers\AbstractFitModifier;
-use Intervention\Image\Drivers\Imagick\ImageFactory;
+use Intervention\Image\Drivers\Imagick\Factory;
 use Intervention\Image\Interfaces\ImageInterface;
 use Intervention\Image\Interfaces\SizeInterface;
 use Intervention\Image\Tests\TestCase;
@@ -26,7 +26,7 @@ class AbstractFitModifierTest extends TestCase
     {
         $modifier = $this->getModifier(100, 200, 'center');
 
-        $image = (new ImageFactory())->newImage($width, $height);
+        $image = (new Factory())->newImage($width, $height);
         $size = $modifier->getCropSize($image);
 
         static::assertSame($expectedWidth, $size->width());
@@ -39,7 +39,7 @@ class AbstractFitModifierTest extends TestCase
     {
         $modifier = $this->getModifier(200, 100, 'center');
 
-        $image = (new ImageFactory())->newImage(300, 200);
+        $image = (new Factory())->newImage(300, 200);
         $size = $modifier->getCropSize($image);
         $resize = $modifier->getResizeSize($size);
 
diff --git a/tests/Drivers/Abstract/Modifiers/AbstractPadModifierTest.php b/tests/Drivers/Abstract/Modifiers/AbstractPadModifierTest.php
index 3f758eff..78c06e2b 100644
--- a/tests/Drivers/Abstract/Modifiers/AbstractPadModifierTest.php
+++ b/tests/Drivers/Abstract/Modifiers/AbstractPadModifierTest.php
@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Intervention\Image\Tests\Drivers\Abstract\Modifiers;
 
 use Intervention\Image\Drivers\Abstract\Modifiers\AbstractPadModifier;
-use Intervention\Image\Drivers\Imagick\ImageFactory;
+use Intervention\Image\Drivers\Imagick\Factory;
 use Intervention\Image\Interfaces\ImageInterface;
 use Intervention\Image\Interfaces\SizeInterface;
 use Intervention\Image\Tests\TestCase;
@@ -28,7 +28,7 @@ final class AbstractPadModifierTest extends TestCase
     {
         $modifier = $this->getModifier(100, 200, 'ffffff', 'center');
 
-        $image = (new ImageFactory())->newImage($width, $height);
+        $image = (new Factory())->newImage($width, $height);
         $size = $modifier->getCropSize($image);
 
         static::assertSame($expectedWidth, $size->width());
@@ -41,7 +41,7 @@ final class AbstractPadModifierTest extends TestCase
     {
         $modifier = $this->getModifier(200, 100, 'ffffff', 'center');
 
-        $image = (new ImageFactory())->newImage(300, 200);
+        $image = (new Factory())->newImage(300, 200);
         $resize = $modifier->getResizeSize($image);
 
         static::assertSame(200, $resize->width());
diff --git a/tests/Drivers/Gd/ImageFactoryTest.php b/tests/Drivers/Gd/FactoryTest.php
similarity index 76%
rename from tests/Drivers/Gd/ImageFactoryTest.php
rename to tests/Drivers/Gd/FactoryTest.php
index 38060e45..6a77eb9e 100644
--- a/tests/Drivers/Gd/ImageFactoryTest.php
+++ b/tests/Drivers/Gd/FactoryTest.php
@@ -4,25 +4,25 @@ namespace Intervention\Image\Tests\Drivers\Gd;
 
 use GdImage;
 use Intervention\Image\Drivers\Gd\Image;
-use Intervention\Image\Drivers\Gd\ImageFactory;
+use Intervention\Image\Drivers\Gd\Factory;
 use Intervention\Image\Tests\TestCase;
 
 /**
  * @requires extension gd
- * @covers \Intervention\Image\Drivers\Gd\ImageFactory
+ * @covers \Intervention\Image\Drivers\Gd\Factory
  */
-class ImageFactoryTest extends TestCase
+class FactoryTest extends TestCase
 {
     public function testNewImage(): void
     {
-        $factory = new ImageFactory();
+        $factory = new Factory();
         $image = $factory->newImage(3, 2);
         $this->assertInstanceOf(Image::class, $image);
     }
 
     public function testNewAnimation(): void
     {
-        $factory = new ImageFactory();
+        $factory = new Factory();
         $image = $factory->newAnimation(function ($animation) {
             $animation->add($this->getTestImagePath('blue.gif'), 1.2);
             $animation->add($this->getTestImagePath('red.gif'), 1.2);
@@ -33,7 +33,7 @@ class ImageFactoryTest extends TestCase
 
     public function testNewCore(): void
     {
-        $factory = new ImageFactory();
+        $factory = new Factory();
         $core = $factory->newCore(3, 2);
         $this->assertInstanceOf(GdImage::class, $core);
     }
diff --git a/tests/Drivers/Imagick/ImageFactoryTest.php b/tests/Drivers/Imagick/FactoryTest.php
similarity index 76%
rename from tests/Drivers/Imagick/ImageFactoryTest.php
rename to tests/Drivers/Imagick/FactoryTest.php
index feb8e131..8cf5f541 100644
--- a/tests/Drivers/Imagick/ImageFactoryTest.php
+++ b/tests/Drivers/Imagick/FactoryTest.php
@@ -4,25 +4,25 @@ namespace Intervention\Image\Tests\Drivers\Imagick;
 
 use Imagick;
 use Intervention\Image\Drivers\Imagick\Image;
-use Intervention\Image\Drivers\Imagick\ImageFactory;
+use Intervention\Image\Drivers\Imagick\Factory;
 use Intervention\Image\Tests\TestCase;
 
 /**
  * @requires extension imagick
- * @covers \Intervention\Image\Drivers\Imagick\ImageFactory
+ * @covers \Intervention\Image\Drivers\Imagick\Factory
  */
-class ImageFactoryTest extends TestCase
+class FactoryTest extends TestCase
 {
     public function testNewImage(): void
     {
-        $factory = new ImageFactory();
+        $factory = new Factory();
         $image = $factory->newImage(3, 2);
         $this->assertInstanceOf(Image::class, $image);
     }
 
     public function testNewAnimation(): void
     {
-        $factory = new ImageFactory();
+        $factory = new Factory();
         $image = $factory->newAnimation(function ($animation) {
             $animation->add($this->getTestImagePath('blue.gif'), 1.2);
             $animation->add($this->getTestImagePath('red.gif'), 1.2);
@@ -33,7 +33,7 @@ class ImageFactoryTest extends TestCase
 
     protected function testNewCore(): void
     {
-        $factory = new ImageFactory();
+        $factory = new Factory();
         $core = $factory->newCore(3, 2);
         $this->assertInstanceOf(Imagick::class, $core);
     }