diff --git a/html/index.php b/html/index.php
index 5a53e3d530b3fe1ae7510ecd8637a7777959c17f..304e73cedb42601377f7cea109e1e3e78a14defa 100644
--- a/html/index.php
+++ b/html/index.php
@@ -119,8 +119,8 @@ if (isset($_REQUEST['signout']) && $_REQUEST['signout']) {
     if ($config->get_cfg_value('casActivated') == 'TRUE') {
       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');
       phpCAS::client(
         CAS_VERSION_2_0,
         $config->get_cfg_value('casHost', 'localhost'),
@@ -580,8 +580,8 @@ if ($config->get_cfg_value('httpAuthActivated') == 'TRUE') {
 } elseif ($config->get_cfg_value('casActivated') == 'TRUE') {
   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');
   Index::casLoginProcess();
 } elseif ($config->get_cfg_value('httpHeaderAuthActivated') == 'TRUE') {
   Index::headerAuthLoginProcess();
diff --git a/include/functions.inc b/include/functions.inc
index 5f848ed87b17141fd7d129a5d27126b0d9bb5ee3..1a9bd6138a7010752b8910c88b86d4f7a3fdef1c 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -83,7 +83,7 @@ $REWRITE = array( "ä" => "ae",
  *  \param array $class_name list of class name
  */
 
-function __fusiondirectory_autoload($class_name)
+function fusiondirectory_autoload ($class_name)
 {
   global $class_mapping, $BASE_DIR, $config;
 
@@ -117,7 +117,7 @@ function __fusiondirectory_autoload($class_name)
     exit;
   }
 }
-spl_autoload_register('__fusiondirectory_autoload');
+spl_autoload_register('fusiondirectory_autoload');
 
 
 /*!