diff --git a/src/Composer/Downloader/FileDownloader.php b/src/Composer/Downloader/FileDownloader.php
index b9852d730..40cbe0a12 100644
--- a/src/Composer/Downloader/FileDownloader.php
+++ b/src/Composer/Downloader/FileDownloader.php
@@ -18,7 +18,7 @@ use Composer\IO\IOInterface;
 use Composer\Package\PackageInterface;
 use Composer\Package\Version\VersionParser;
 use Composer\Plugin\PluginEvents;
-use Composer\Plugin\PrepareRemoteFilesystemEvent;
+use Composer\Plugin\PreFileDownloadEvent;
 use Composer\EventDispatcher\EventDispatcher;
 use Composer\Util\Filesystem;
 use Composer\Util\GitHub;
@@ -94,11 +94,11 @@ class FileDownloader implements DownloaderInterface
         $processedUrl = $this->processUrl($package, $url);
         $hostname = parse_url($processedUrl, PHP_URL_HOST);
 
-        $prepRfsEvent = new PrepareRemoteFilesystemEvent(PluginEvents::PREPARE_REMOTE_FILESYSTEM, $this->rfs, $processedUrl);
+        $preFileDownloadEvent = new PreFileDownloadEvent(PluginEvents::PRE_FILE_DOWNLOAD, $this->rfs, $processedUrl);
         if ($this->eventDispatcher) {
-            $this->eventDispatcher->dispatch($prepRfsEvent->getName(), $prepRfsEvent);
+            $this->eventDispatcher->dispatch($preFileDownloadEvent->getName(), $preFileDownloadEvent);
         }
-        $rfs = $prepRfsEvent->getRemoteFilesystem();
+        $rfs = $preFileDownloadEvent->getRemoteFilesystem();
 
         if (strpos($hostname, '.github.com') === (strlen($hostname) - 11)) {
             $hostname = 'github.com';
diff --git a/src/Composer/Plugin/PluginEvents.php b/src/Composer/Plugin/PluginEvents.php
index bfdfba3dd..cbf9b1148 100644
--- a/src/Composer/Plugin/PluginEvents.php
+++ b/src/Composer/Plugin/PluginEvents.php
@@ -20,12 +20,12 @@ namespace Composer\Plugin;
 class PluginEvents
 {
     /**
-     * The PREPARE_REMOTE_FILESYSTEM event occurs before downloading a file
+     * The PRE_FILE_DOWNLOAD event occurs before downloading a file
      *
      * The event listener method receives a
-     * Composer\Plugin\PrepareRemoteFilesystemEvent instance.
+     * Composer\Plugin\PreFileDownloadEvent instance.
      *
      * @var string
      */
-    const PREPARE_REMOTE_FILESYSTEM = 'prepare-remote-filesystem';
+    const PRE_FILE_DOWNLOAD = 'pre-file-download';
 }
diff --git a/src/Composer/Plugin/PrepareRemoteFilesystemEvent.php b/src/Composer/Plugin/PreFileDownloadEvent.php
similarity index 95%
rename from src/Composer/Plugin/PrepareRemoteFilesystemEvent.php
rename to src/Composer/Plugin/PreFileDownloadEvent.php
index 91b0543f3..94621a5c2 100644
--- a/src/Composer/Plugin/PrepareRemoteFilesystemEvent.php
+++ b/src/Composer/Plugin/PreFileDownloadEvent.php
@@ -18,11 +18,11 @@ use Composer\EventDispatcher\Event;
 use Composer\Util\RemoteFilesystem;
 
 /**
- * The Prepare Remote Filesystem Event.
+ * The pre file download event.
  *
  * @author Nils Adermann <naderman@naderman.de>
  */
-class PrepareRemoteFilesystemEvent extends Event
+class PreFileDownloadEvent extends Event
 {
     /**
      * @var RemoteFilesystem