diff --git a/system/src/Grav/Common/Page/Media.php b/system/src/Grav/Common/Page/Media.php
index b8aba4351..f5f9dbdaf 100644
--- a/system/src/Grav/Common/Page/Media.php
+++ b/system/src/Grav/Common/Page/Media.php
@@ -251,7 +251,10 @@ class Media extends Getters
         $width = (int) ($medium->get('width') * $ratio);
         $height = (int) ($medium->get('height') * $ratio);
 
-        $file = $medium->resize($width, $height)->url();
+        $basename = $medium->get('basename');
+        $basename = str_replace('@'.$from.'x', '@'.$to.'x', $basename);
+
+        $file = $medium->resize($width, $height)->setPrettyName($basename)->url();
         $file = preg_replace('|'. preg_quote(self::$grav['base_url_relative']) .'$|', '', GRAV_ROOT) . $file;
 
         $size = filesize($file);
diff --git a/system/src/Grav/Common/Page/Medium.php b/system/src/Grav/Common/Page/Medium.php
index 1297abb29..40b6fa945 100644
--- a/system/src/Grav/Common/Page/Medium.php
+++ b/system/src/Grav/Common/Page/Medium.php
@@ -367,6 +367,7 @@ class Medium extends Data
         if ($method == 'cropZoom') {
             $method = 'zoomCrop';
         }
+
         // Always initialize image.
         if (!$this->image) {
             $this->image();