diff --git a/app/Http/Controllers/Api/V1/Product/Resources/ProductMediaResource.php b/app/Http/Controllers/Api/V1/Product/Resources/ProductMediaResource.php
index 150e182..122c69b 100644
--- a/app/Http/Controllers/Api/V1/Product/Resources/ProductMediaResource.php
+++ b/app/Http/Controllers/Api/V1/Product/Resources/ProductMediaResource.php
@@ -15,9 +15,8 @@ class ProductMediaResource extends JsonResource
     public function toArray(Request $request): array
     {
         return [
-            'thumbnail' => $this->getUrl('thumb288x431'),
+            'thumbnail' => $this->getUrl('thumb400x400'),
             'images_400x400' => $this->getUrl('thumb400x400'),
-            'images_720x720' => $this->getUrl('thumb720x720'),
             'images_800x800' => $this->getUrl('thumb800x800'),
             'images_1200x1200' => $this->getUrl('thumb1200x1200'),
         ];
diff --git a/app/Support/ShortFileNamer.php b/app/Support/ShortFileNamer.php
index 0569a89..02bd4e4 100644
--- a/app/Support/ShortFileNamer.php
+++ b/app/Support/ShortFileNamer.php
@@ -8,11 +8,11 @@ use Illuminate\Support\Str;
 class ShortFileNamer extends FileNamer
 {
     /**
-     * Keep the original file name exactly as it was uploaded.
+     * Generate a short random name for the original file.
      */
     public function originalFileName(string $fileName): string
     {
-        return pathinfo($fileName, PATHINFO_FILENAME);
+        return Str::random(10);
     }
 
     /**
@@ -20,7 +20,9 @@ class ShortFileNamer extends FileNamer
      */
     public function conversionFileName(string $fileName, Conversion $conversion): string
     {
-        return Str::random(12);
+        $fileName = pathinfo($fileName, PATHINFO_FILENAME);
+
+        return "{$fileName}-{$conversion->getName()}";
     }
 
     public function responsiveFileName(string $fileName): string