diff --git a/lib/Doctrine/ORM/Event/PreLoadClassMetadataEventArgs.php b/lib/Doctrine/ORM/Event/OnClassMetadataNotFoundEventArgs.php
similarity index 97%
rename from lib/Doctrine/ORM/Event/PreLoadClassMetadataEventArgs.php
rename to lib/Doctrine/ORM/Event/OnClassMetadataNotFoundEventArgs.php
index e111cdf59..8eac9afc0 100644
--- a/lib/Doctrine/ORM/Event/PreLoadClassMetadataEventArgs.php
+++ b/lib/Doctrine/ORM/Event/OnClassMetadataNotFoundEventArgs.php
@@ -28,7 +28,7 @@ use Doctrine\ORM\EntityManager;
  * @author Jonathan H. Wage <jonwage@gmail.com>
  * @since  2.3
  */
-class PreLoadClassMetadataEventArgs extends EventArgs
+class OnClassMetadataNotFoundEventArgs extends EventArgs
 {
     /**
      * @var \Doctrine\ORM\Mapping\ClassMetadata
diff --git a/lib/Doctrine/ORM/Events.php b/lib/Doctrine/ORM/Events.php
index e27a4163a..d089a4366 100644
--- a/lib/Doctrine/ORM/Events.php
+++ b/lib/Doctrine/ORM/Events.php
@@ -125,7 +125,7 @@ final class Events
      *
      * @var string
      */
-    const preLoadClassMetadata = 'preLoadClassMetadata';
+    const onClassMetadataNotFound = 'onClassMetadataNotFound';
 
     /**
      * The preFlush event occurs when the EntityManager#flush() operation is invoked,
diff --git a/lib/Doctrine/ORM/Tools/ResolveTargetEntityListener.php b/lib/Doctrine/ORM/Tools/ResolveTargetEntityListener.php
index 374dba8ab..a0f1e0b39 100644
--- a/lib/Doctrine/ORM/Tools/ResolveTargetEntityListener.php
+++ b/lib/Doctrine/ORM/Tools/ResolveTargetEntityListener.php
@@ -20,7 +20,7 @@
 namespace Doctrine\ORM\Tools;
 
 use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
-use Doctrine\ORM\Event\PreLoadClassMetadataEventArgs;
+use Doctrine\ORM\Event\OnClassMetadataNotFoundEventArgs;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\Events;
@@ -45,7 +45,7 @@ class ResolveTargetEntityListener implements EventSubscriber
     {
         return array(
             Events::loadClassMetadata,
-            Events::preLoadClassMetadata
+            Events::onClassMetadataNotFound
         );
     }
     /**
@@ -63,7 +63,7 @@ class ResolveTargetEntityListener implements EventSubscriber
         $this->resolveTargetEntities[ltrim($originalEntity, "\\")] = $mapping;
     }
 
-    public function preLoadClassMetadata(PreLoadClassMetadataEventArgs $args)
+    public function onClassMetadataNotFound(OnClassMetadataNotFoundEventArgs $args)
     {
         if (array_key_exists($args->getClassName(), $this->resolveTargetEntities)) {
             $args->getEntityManager()->getClassMetadata($this->resolveTargetEntities[$args->getClassname()]['targetEntity']);