diff --git a/DependencyInjection/FOSElasticaExtension.php b/DependencyInjection/FOSElasticaExtension.php
index 6380873..733a039 100644
--- a/DependencyInjection/FOSElasticaExtension.php
+++ b/DependencyInjection/FOSElasticaExtension.php
@@ -403,17 +403,32 @@ class FOSElasticaExtension extends Extension
         return $listenerId;
     }
 
+    /**
+     * Map Elastica to Doctrine events for the current driver
+     */
     private function getDoctrineEvents(array $typeConfig)
     {
         // Flush always calls depending on actions scheduled in lifecycle listeners
         $typeConfig['listener']['flush'] = true;
 
+        switch ($typeConfig['driver']) {
+            case 'orm':
+                $eventsClass = '\Doctrine\ORM\Events';
+                break;
+            case 'mongodb':
+                $eventsClass = '\Doctrine\ODM\MongoDB\Events';
+                break;
+            default:
+                throw new InvalidArgumentException(sprintf('Cannot determine events for driver "%s"', $typeConfig['driver']));
+                break;
+        }
+
         $events = array();
         $eventMapping = array(
-            'insert' => array('postPersist'),
-            'update' => array('postUpdate'),
-            'delete' => array('preRemove'),
-            'flush' => array($typeConfig['listener']['immediate'] ? 'preFlush' : 'postFlush')
+            'insert' => array(constant($eventsClass.'::postPersist')),
+            'update' => array(constant($eventsClass.'::postUpdate')),
+            'delete' => array(constant($eventsClass.'::preRemove')),
+            'flush' => array($typeConfig['listener']['immediate'] ? constant($eventsClass.'::preFlush') : constant($eventsClass.'::postFlush'))
         );
 
         foreach ($eventMapping as $event => $doctrineEvents) {
diff --git a/Doctrine/Listener.php b/Doctrine/Listener.php
index 683070e..383e02f 100644
--- a/Doctrine/Listener.php
+++ b/Doctrine/Listener.php
@@ -27,7 +27,7 @@ class Listener implements EventSubscriber
     protected $objectClass;
 
     /**
-     * List of su]bscribed events
+     * List of subscribed events
      *
      * @var array
      */