diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt
index 78230041d..77c2de04d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt
@@ -83,7 +83,7 @@ class DownloadProvider(private val context: Context) {
      * @param manga the manga to query.
      */
     fun getMangaDirName(manga: Manga): String {
-        return DiskUtil.buildValidFatFilename(manga.title)
+        return DiskUtil.buildValidFilename(manga.title)
     }
 
     /**
@@ -92,7 +92,7 @@ class DownloadProvider(private val context: Context) {
      * @param chapter the chapter to query.
      */
     fun getChapterDirName(chapter: Chapter): String {
-        return DiskUtil.buildValidFatFilename(chapter.name)
+        return DiskUtil.buildValidFilename(chapter.name)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
index f99b7ada9..cdb030f1b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
@@ -570,17 +570,16 @@ class ReaderPresenter : BasePresenter<ReaderActivity>() {
                     val destDir = File(pictureDirectory)
                     destDir.mkdirs()
 
-                    // Find out file extension.
+                    // Find out file mime type.
                     val mime = context.contentResolver.getType(page.uri)
                     ?: context.contentResolver.openInputStream(page.uri).buffered().use {
                         URLConnection.guessContentTypeFromStream(it)
                     }
+
+                    // Build destination file.
                     val ext = MimeTypeMap.getSingleton().getExtensionFromMimeType(mime) ?: "jpg"
-
-                    // Destination file.
-
-                    val filename = "${manga.title} - ${chapter.name} - ${page.index + 1}.$ext"
-                    val destFile = File(destDir, DiskUtil.buildValidFatFilename(filename))
+                    val filename = "${manga.title} - ${chapter.name} - ${page.index + 1}"
+                    val destFile = File(destDir, DiskUtil.buildValidFilename(filename) + ".$ext")
 
                     context.contentResolver.openInputStream(page.uri).use { input ->
                         destFile.outputStream().use { output ->
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/DiskUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/DiskUtil.kt
index 13c8126e5..b3e3acda2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/DiskUtil.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/DiskUtil.kt
@@ -36,7 +36,7 @@ object DiskUtil {
      * replacing any invalid characters with "_". This method doesn't allow private files (starting
      * with a dot), but you can manually add it later.
      */
-    fun buildValidFatFilename(origName: String): String {
+    fun buildValidFilename(origName: String): String {
         val name = origName.trim('.', ' ')
         if (name.isNullOrEmpty()) {
             return "(invalid)"