diff --git a/include/functions.inc b/include/functions.inc
index e75dfa313f32b495fc3193b669f83e1a754a749f..71842772fb1342e4c0a9aca934371545998005ee 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -41,7 +41,7 @@ require_once('accept-to-gettext.inc');
  *  \param array $class_name list of class name
  */
 
-function __fusiondirectory_autoload ($class_name)
+function fusiondirectory_autoload ($class_name)
 {
   global $class_mapping, $BASE_DIR, $config;
 
@@ -79,7 +79,7 @@ function __fusiondirectory_autoload ($class_name)
     exit;
   }
 }
-spl_autoload_register('__fusiondirectory_autoload');
+spl_autoload_register('fusiondirectory_autoload');
 
 
 /*!
diff --git a/include/login/class_LoginCAS.inc b/include/login/class_LoginCAS.inc
index bff298ce2c5d336cdcf733d0fa8bb922e7c7bb3e..46fe285a46f49b599b1abc8a2a07e13cdea5d3de 100644
--- a/include/login/class_LoginCAS.inc
+++ b/include/login/class_LoginCAS.inc
@@ -36,8 +36,8 @@ class LoginCAS extends LoginMethod
 
     require_once('CAS.php');
     /* Move FD autoload after CAS autoload */
-    spl_autoload_unregister('__fusiondirectory_autoload');
-    spl_autoload_register('__fusiondirectory_autoload');
+    spl_autoload_unregister('fusiondirectory_autoload');
+    spl_autoload_register('fusiondirectory_autoload');
 
     if ($config->get_cfg_value('casVerbose') == 'TRUE') {
       phpCAS::setVerbose(TRUE);