diff --git a/src/Composer/Downloader/ArchiveDownloader.php b/src/Composer/Downloader/ArchiveDownloader.php
index 48e39626a..f53798a00 100644
--- a/src/Composer/Downloader/ArchiveDownloader.php
+++ b/src/Composer/Downloader/ArchiveDownloader.php
@@ -31,9 +31,8 @@ abstract class ArchiveDownloader extends FileDownloader
         $temporaryDir = $this->config->get('vendor-dir').'/composer/'.substr(md5(uniqid('', true)), 0, 8);
         $retries = 3;
         while ($retries--) {
-            parent::download($package, $path);
+            $fileName = parent::download($package, $path);
 
-            $fileName = $this->getFileName($package, $path);
             if ($this->io->isVerbose()) {
                 $this->io->write('    Extracting archive');
             }
diff --git a/src/Composer/Downloader/FileDownloader.php b/src/Composer/Downloader/FileDownloader.php
index 292b24f59..8ed0712bf 100644
--- a/src/Composer/Downloader/FileDownloader.php
+++ b/src/Composer/Downloader/FileDownloader.php
@@ -153,6 +153,8 @@ class FileDownloader implements DownloaderInterface
             $this->clearCache($package, $path);
             throw $e;
         }
+
+        return $fileName;
     }
 
     /**