diff --git a/main/inc/lib/autoload.class.php b/main/inc/lib/autoload.class.php
index 226051e3af..1187bdf9fe 100644
--- a/main/inc/lib/autoload.class.php
+++ b/main/inc/lib/autoload.class.php
@@ -142,6 +142,8 @@ class Autoload
         $result['EvalLink'] = '/main/gradebook/lib/be/evallink.class.php';
         $result['Evaluation'] = '/main/gradebook/lib/be/evaluation.class.php';
         $result['Event'] = '/main/coursecopy/classes/Event.class.php';
+        $result['EventsMail'] = '/main/inc/lib/events_email.class.php';
+        $result['EventsDispatcher'] = '/main/inc/lib/events_dispatcher.class.php';
         $result['Exercise'] = '/main/exercice/exercise.class.php';
         $result['ExerciseLink'] = '/main/gradebook/lib/be/exerciselink.class.php';
         $result['ExerciseResult'] = '/main/exercice/exercise_result.class.php';
@@ -662,4 +664,4 @@ class AutoloadClassFinder
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/main/inc/lib/events_dispatcher.lib.php b/main/inc/lib/events_dispatcher.class.php
similarity index 92%
rename from main/inc/lib/events_dispatcher.lib.php
rename to main/inc/lib/events_dispatcher.class.php
index 35e8b36b2b..69dffc919f 100644
--- a/main/inc/lib/events_dispatcher.lib.php
+++ b/main/inc/lib/events_dispatcher.class.php
@@ -1,7 +1,5 @@
 <?php
-
-require_once api_get_path(CONFIGURATION_PATH).'events.conf.php';
-require_once api_get_path(LIBRARY_PATH).'events_email.lib.php';
+include_once api_get_path(CONFIGURATION_PATH).'events.conf.php';
 
 /**
  * 
diff --git a/main/inc/lib/events_email.lib.php b/main/inc/lib/events_email.class.php
similarity index 100%
rename from main/inc/lib/events_email.lib.php
rename to main/inc/lib/events_email.class.php