diff --git a/contrib/openldap/fd-samba3.ldif b/contrib/openldap/fd-samba3.ldif
index d7987b0d6747c8ba30bf88677f68229d446a778a..e2bb12b95b6a0566395ca6e257d7e2b99d9e968c 100644
--- a/contrib/openldap/fd-samba3.ldif
+++ b/contrib/openldap/fd-samba3.ldif
@@ -230,7 +230,7 @@ olcObjectClasses: {18}( 1.3.6.1.4.1.10098.1.2.1.19.19 NAME 'gosaSnapshotObject
  RAL MUST ( gosaSnapshotType $ gosaSnapshotTimestamp $ gosaSnapshotDN $ gosaSn
  apshotData ) MAY description )
 olcObjectClasses: {19}( 1.3.6.1.4.1.10098.1.2.1.19.20 NAME 'gosaConfig' DESC '
- Settings for gosa. Replaces parts of the gosa.conf. (v2.6)' SUP top STRUCTURA
+ Settings for gosa. Replaces parts of the fusiondirectory.conf. (v2.6)' SUP top STRUCTURA
  L MAY gosaSetting )
 olcObjectClasses: {20}( 1.3.6.1.4.1.10098.1.2.1.43 NAME 'gotoSubmenuEntry' DES
  C 'GOto - contains environment settings (v2.6)' SUP top STRUCTURAL MUST cn MA
diff --git a/contrib/openldap/fd-samba3.schema b/contrib/openldap/fd-samba3.schema
index a8b1de34f7527bad9d80373ea59ac5945ef2830a..d880ba98bac125441068a95803b23de18cc20f73 100644
--- a/contrib/openldap/fd-samba3.schema
+++ b/contrib/openldap/fd-samba3.schema
@@ -393,7 +393,7 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.19 NAME 'gosaSnapshotObject'
        MAY  ( description ) )
 
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.20 NAME 'gosaConfig'
-       DESC 'Settings for gosa. Replaces parts of the gosa.conf. (v2.6)' SUP top STRUCTURAL
+       DESC 'Settings for gosa. Replaces parts of the fusiondirectory.conf. (v2.6)' SUP top STRUCTURAL
        MAY  ( gosaSetting ) )
 
 # GOto submenu entries
diff --git a/include/class_SnapshotHandler.inc b/include/class_SnapshotHandler.inc
index b6771d1c34f24d31046068dae0eeb03fadd96aff..efd6fbaf947d39c4d32119f6309aa23b8114228e 100644
--- a/include/class_SnapshotHandler.inc
+++ b/include/class_SnapshotHandler.inc
@@ -253,7 +253,7 @@ class SnapshotHandler {
       return;
     }
 
-    /* Get configuration from gosa.conf */
+    /* Get configuration from fusiondirectory.conf */
     $config = $this->config;
 
     /* Create lokal ldap connection */
diff --git a/include/class_config.inc b/include/class_config.inc
index b46792556ba1fd76620a327feeb8827276a4c698..0c914458dfd89c69d212047c9b36e83f34d9be8b 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -24,7 +24,7 @@
  *  \ingroup coreclasses
  *
  * The configuration class, responsible for parsing and querying the
- * gosa configuration file.
+ * fusiondirectory configuration file.
  */
 
 class config  {
@@ -149,7 +149,7 @@ class config  {
     $xmldata= fread($fh, 100000);
     fclose($fh);
     if(!xml_parse($this->parser, chop($xmldata))){
-      $msg = sprintf(_("XML error in gosa.conf: %s at line %d"),
+      $msg = sprintf(_("XML error in fusiondirectory.conf: %s at line %d"),
             xml_error_string(xml_get_error_code($this->parser)),
             xml_get_current_line_number($this->parser));
       msg_dialog::display(_("Configuration error"), $msg, FATAL_ERROR_DIALOG);
@@ -1084,7 +1084,7 @@ class config  {
    *
    *  This function checks if the configuration file version matches the
    *  version of the gosa version, by comparing it with the configuration
-   *  file version of the example gosa.conf that comes with GOsa.
+   *  file version of the example fusiondirectory.conf that comes with GOsa.
    *  If a version mismatch occurs an error is triggered.
    * */
   function check_config_version()
@@ -1097,7 +1097,7 @@ class config  {
      */
     session::global_set("LastChecked",$this->config_version);
 
-    $current = md5(file_get_contents(CONFIG_TEMPLATE_DIR."/gosa.conf"));
+    $current = md5(file_get_contents(CONFIG_TEMPLATE_DIR."/fusiondirectory.conf"));
 
     /* Check contributed config version and current config version.
      */
@@ -1112,7 +1112,7 @@ class config  {
    *  On debian systems the session files are deleted with
    *  a cronjob, which detects all files older than specified 
    *  in php.ini:'session.gc_maxlifetime' and removes them.
-   *  This function checks if the gosa.conf value matches the range
+   *  This function checks if the fusiondirectory.conf value matches the range
    *  defined by session.gc_maxlifetime.
    *
    *  \return boolean TRUE or FALSE depending on weither the settings match
diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index cdf8ba19595da4ec1f6682b2419d3c28a32e5e78..4796d55625320186115d02359fc214b8089fdfd0 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -1204,7 +1204,7 @@ class plugin
   }
 
 
-  /*! \brief    Calls external hooks which are defined for this plugin (gosa.conf)
+  /*! \brief    Calls external hooks which are defined for this plugin (fusiondirectory.conf)
    *            Replaces placeholder by class values of this plugin instance.
    *  @param    Allows to a add special replacements.
    */
@@ -1416,7 +1416,7 @@ class plugin
       return;
     }
 
-    /* Get configuration from gosa.conf */
+    /* Get configuration from fusiondirectory.conf */
     $config = $this->config;
 
     /* Create lokal ldap connection */
diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index bb0b27bd6a3282dfe6d56819d7bc3ca3c84079de..dde16e94fddeab65482239a1bbf54478571b3117 100644
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -719,7 +719,7 @@ class userinfo
   }
 
  
-  /*! \brief  Returns TRUE if the current user is configured in IGNORE_ACL=".." in your gosa.conf 
+  /*! \brief  Returns TRUE if the current user is configured in IGNORE_ACL=".." in your fusiondirectory.conf 
       @param  Return Boolean TRUE if we have to skip ACL checks else FALSE.
    */ 
   function ignore_acl_for_current_user()
diff --git a/include/functions.inc b/include/functions.inc
index 003a5f49651e16878cde20fd1fe6594297109a8b..8ded9fe7b39df062fc684f02fa9c73fd04311809 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -35,10 +35,10 @@ if(!isset($_SERVER['CONFIG_DIR'])){
 }
 
 /* Allow setting the config file in the apache configuration
-    e.g.  SetEnv CONFIG_FILE gosa.conf.2.6
+    e.g.  SetEnv CONFIG_FILE fusiondirectory.conf.2.6
  */
 if(!isset($_SERVER['CONFIG_FILE'])){
-  define ("CONFIG_FILE", "gosa.conf");
+  define ("CONFIG_FILE", "fusiondirectory.conf");
 }else{
   define ("CONFIG_FILE",$_SERVER['CONFIG_FILE']);
 }
@@ -251,7 +251,7 @@ function get_browser_language()
     }
   }
 
-  /* Check for global language settings in gosa.conf */
+  /* Check for global language settings in fusiondirectory.conf */
   if (isset ($config) && $config->get_cfg_value('language') != ""){
     $lang = $config->get_cfg_value('language');
     if(!preg_match("/utf/i",$lang)){
@@ -2061,7 +2061,7 @@ function recurse($rule, $variables)
  *
  *  Unroll given rule string by filling in attributes.
  *
- * \param string 'rule' The rule string from gosa.conf.
+ * \param string 'rule' The rule string from fusiondirectory.conf.
  * \param array 'attributes' A dictionary of attribute/value mappings
  * \return string Expanded string, still containing the id keyword.
  */
@@ -2105,7 +2105,7 @@ function expand_id($rule, $attributes)
  *  Unroll given rule string by filling in attributes and replacing
  *  all keywords.
  *
- * \param string 'rule' The rule string from gosa.conf.
+ * \param string 'rule' The rule string from fusiondirectory.conf.
  * \param array 'attributes' A dictionary of attribute/value mappings
  * \return array List of valid not used uids
  */
diff --git a/include/utils/class_timezone.inc b/include/utils/class_timezone.inc
index 8700800144f17dfa010833196d912446d72faa53..cc6334bf7f5bf1ff53f2118bd27a90b4b39258b3 100644
--- a/include/utils/class_timezone.inc
+++ b/include/utils/class_timezone.inc
@@ -39,14 +39,14 @@ class timezone {
       $stamp = time();
     }
 
-    /* Is there a timezone configured in the gosa configuration (gosa.conf) */
+    /* Is there a timezone configured in the fusiondirectory configuration (fusiondirectory.conf) */
     if ($config->get_cfg_value("timezone") != ""){
 
       /* Get zonename */
       $tz = $config->get_cfg_value("timezone");
 
       if(!@date_default_timezone_set($tz)){
-        msg_dialog::display(_("Configuration error"), sprintf(_("The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate correct timezone offset."), $tz), ERROR_DIALOG);
+        msg_dialog::display(_("Configuration error"), sprintf(_("The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate correct timezone offset."), $tz), ERROR_DIALOG);
       }
       $tz_delta = date("Z", $stamp);
       $tz_delta = $tz_delta / 3600 ;
diff --git a/locale/core/de/LC_MESSAGES/messages.po b/locale/core/de/LC_MESSAGES/messages.po
index b05312b3b06e091027ec391e0196b9355152c9e4..6ecf00837c4fc4aef0c079e905451de07650dbe6 100644
--- a/locale/core/de/LC_MESSAGES/messages.po
+++ b/locale/core/de/LC_MESSAGES/messages.po
@@ -759,10 +759,10 @@ msgstr "Die Sitzung ist nicht verschlüsselt!"
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
-"Die Konfiguration der Gültigkeitsdauer einer Sitzung in Ihrer gosa.conf wird "
+"Die Konfiguration der Gültigkeitsdauer einer Sitzung in Ihrer fusiondirectory.conf wird "
 "von der Einstellung in der php.ini überschrieben."
 
 #: html/index.php:165
@@ -1888,10 +1888,10 @@ msgstr "%s%% Trefferquote in Datei %s"
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
-"Die Einstellung '%s' der Zeitzone in Ihrer gosa.conf ist ungültig. Kann "
+"Die Einstellung '%s' der Zeitzone in Ihrer fusiondirectory.conf ist ungültig. Kann "
 "Zeitzonen-Versatz nicht berechnen."
 
 #: include/utils/class_xml.inc:48
@@ -2558,8 +2558,8 @@ msgstr "Kann Eintrag %s nicht entfernen!"
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "XML-Fehler in der Datei gosa.conf: %s in Zeile %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr "XML-Fehler in der Datei fusiondirectory.conf: %s in Zeile %d"
 
 #: include/class_config.inc:318
 msgid "Cannot bind to LDAP. Please contact the system administrator."
diff --git a/locale/core/es/LC_MESSAGES/messages.po b/locale/core/es/LC_MESSAGES/messages.po
index 7fe7753d7021d423cb3f5f343d9e6b4633289d64..26d17e69df9978d39c2a53c2f08ba715755137be 100644
--- a/locale/core/es/LC_MESSAGES/messages.po
+++ b/locale/core/es/LC_MESSAGES/messages.po
@@ -745,10 +745,10 @@ msgstr "¡La sesión no es codificada!"
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
-"El tiempo de vida de sesión es su gosa.conf sera sustituido por el valor de "
+"El tiempo de vida de sesión es su fusiondirectory.conf sera sustituido por el valor de "
 "ini de php."
 
 #: html/index.php:165
@@ -1882,10 +1882,10 @@ msgstr "%s%% procentaje en fichero %s"
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
-"El parámetro de zona horaria '%s' en gosa.conf no es válido. No se puede "
+"El parámetro de zona horaria '%s' en fusiondirectory.conf no es válido. No se puede "
 "calcular una compensación correcta para la zona horaria."
 
 #: include/utils/class_xml.inc:48
@@ -2548,8 +2548,8 @@ msgstr "¡No se puede eliminar la entrada %s!"
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "Error XML en gosa.conf: %s en la línea %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr "Error XML en fusiondirectory.conf: %s en la línea %d"
 
 #: include/class_config.inc:318
 msgid "Cannot bind to LDAP. Please contact the system administrator."
diff --git a/locale/core/fr/LC_MESSAGES/messages.po b/locale/core/fr/LC_MESSAGES/messages.po
index ba1a48a9b7d2025f0762a780fc63ae42468e8bb2..8f999ead5ea1d1f6f18b3a753d3c2e7de42cf58a 100644
--- a/locale/core/fr/LC_MESSAGES/messages.po
+++ b/locale/core/fr/LC_MESSAGES/messages.po
@@ -750,10 +750,10 @@ msgstr "La session n'est pas cryptée !"
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
-"La durée de validité des sessions configurée dans votre gosa.conf sera "
+"La durée de validité des sessions configurée dans votre fusiondirectory.conf sera "
 "remplacée par celle définie dans votre php.ini."
 
 #: html/index.php:165
@@ -1891,10 +1891,10 @@ msgstr "%s%% de correspondance dans le fichier %s"
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
-"Le fuseau horaire '%s' indiqué dans votre gosa.conf est invalide. Impossible "
+"Le fuseau horaire '%s' indiqué dans votre fusiondirectory.conf est invalide. Impossible "
 "de calculer le décalage horaire correct."
 
 #: include/utils/class_xml.inc:48
@@ -2565,8 +2565,8 @@ msgstr "Impossible d'enlever l'entrée %s !"
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "Erreur XML dans gosa.conf: %s à la ligne %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr "Erreur XML dans fusiondirectory.conf: %s à la ligne %d"
 
 #: include/class_config.inc:318
 msgid "Cannot bind to LDAP. Please contact the system administrator."
diff --git a/locale/core/it/LC_MESSAGES/messages.po b/locale/core/it/LC_MESSAGES/messages.po
index 96d4c6b50442ff219feb964da65f6b6bb16e3d91..d17c834cf07dd1dd61307de6ebd793460425c4fb 100644
--- a/locale/core/it/LC_MESSAGES/messages.po
+++ b/locale/core/it/LC_MESSAGES/messages.po
@@ -621,7 +621,7 @@ msgstr "Terminal Server"
 #: html/password.php:58 html/index.php:144
 #, fuzzy, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
-msgstr "Il file di configurazione di GOsa %s/gosa.conf non è legibile."
+msgstr "Il file di configurazione di GOsa %s/fusiondirectory.conf non è legibile."
 
 #: html/password.php:74 html/index.php:144 html/index.php:216
 #: html/main.php:268
@@ -716,7 +716,7 @@ msgstr "Rilevato un conflitto di sessione"
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
 
@@ -1857,7 +1857,7 @@ msgstr ""
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
 
@@ -2538,7 +2538,7 @@ msgstr ""
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
 #: include/class_config.inc:318
@@ -5517,12 +5517,12 @@ msgstr "File di configurazione"
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
-msgstr "Il file di configurazione di GOsa %s/gosa.conf non è legibile."
+msgstr "Il file di configurazione di GOsa %s/fusiondirectory.conf non è legibile."
 
 #: setup/class_setupStep_Finish.inc:106
 #, fuzzy
 msgid "The configuration is currently not readable or it does not exists."
-msgstr "Il file di configurazione di GOsa %s/gosa.conf non è legibile."
+msgstr "Il file di configurazione di GOsa %s/fusiondirectory.conf non è legibile."
 
 #: setup/class_setupStep_Finish.inc:115
 #, fuzzy, php-format
diff --git a/locale/core/messages.po b/locale/core/messages.po
index 83cb534debcb17f4d75f23d35272db9ec1815cf7..42b73baa6e51a28657426574089e6f43be8f79f6 100644
--- a/locale/core/messages.po
+++ b/locale/core/messages.po
@@ -683,7 +683,7 @@ msgstr ""
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
 
@@ -1751,7 +1751,7 @@ msgstr ""
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
 
@@ -2394,7 +2394,7 @@ msgstr ""
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
 #: include/class_config.inc:318
diff --git a/locale/core/nl/LC_MESSAGES/messages.po b/locale/core/nl/LC_MESSAGES/messages.po
index 52af930555394db03ef73fac0535e4fffd49e6b3..e7b8ca7739988e1e4173bcfc7fcb407d0196c583 100644
--- a/locale/core/nl/LC_MESSAGES/messages.po
+++ b/locale/core/nl/LC_MESSAGES/messages.po
@@ -656,7 +656,7 @@ msgstr "Terminal server"
 #: html/password.php:58 html/index.php:144
 #, fuzzy, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
-msgstr "GOsa configuratie %s/gosa.conf is niet leesbaar. Geannuleerd."
+msgstr "GOsa configuratie %s/fusiondirectory.conf is niet leesbaar. Geannuleerd."
 
 #: html/password.php:74 html/index.php:144 html/index.php:216
 #: html/main.php:268
@@ -754,7 +754,7 @@ msgstr "De sessie zal niet versleuteld zijn."
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
 
@@ -1415,7 +1415,7 @@ msgid ""
 "administrator!"
 msgstr ""
 "Kan de blokkade informatie niet ophalen uit de LDAP database. Controleer a.u."
-"b. de 'config' regel in gosa.conf!"
+"b. de 'config' regel in fusiondirectory.conf!"
 
 #: include/functions.inc:825
 #, fuzzy, php-format
@@ -1915,7 +1915,7 @@ msgstr "%s%% resultaat in bestand %s"
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
 
@@ -2611,8 +2611,8 @@ msgstr "Onbekende FAI status %s"
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "XML fout in gosa.conf: %s op regel %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr "XML fout in fusiondirectory.conf: %s op regel %d"
 
 #: include/class_config.inc:318
 #, fuzzy
@@ -5606,12 +5606,12 @@ msgstr "Configuratie bestand"
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
-msgstr "GOsa configuratie %s/gosa.conf is niet leesbaar. Geannuleerd."
+msgstr "GOsa configuratie %s/fusiondirectory.conf is niet leesbaar. Geannuleerd."
 
 #: setup/class_setupStep_Finish.inc:106
 #, fuzzy
 msgid "The configuration is currently not readable or it does not exists."
-msgstr "GOsa configuratie %s/gosa.conf is niet leesbaar. Geannuleerd."
+msgstr "GOsa configuratie %s/fusiondirectory.conf is niet leesbaar. Geannuleerd."
 
 #: setup/class_setupStep_Finish.inc:115
 #, fuzzy, php-format
@@ -8514,10 +8514,10 @@ msgstr "automatisch"
 
 #, fuzzy
 #~ msgid ""
-#~ "Setting for SMBHASH in gosa.conf is incorrect! Cannot change Samba "
+#~ "Setting for SMBHASH in fusiondirectory.conf is incorrect! Cannot change Samba "
 #~ "password."
 #~ msgstr ""
-#~ "De instelling voor 'SMBHASH' in gosa.conf is niet correct. Kan het samba "
+#~ "De instelling voor 'SMBHASH' in fusiondirectory.conf is niet correct. Kan het samba "
 #~ "wachtwoord niet veranderen."
 
 #, fuzzy
diff --git a/locale/core/pl/LC_MESSAGES/messages.po b/locale/core/pl/LC_MESSAGES/messages.po
index f615cab0ed8fa03434062888f075475a40023901..fa83d3f921ad6025c43869d39e7ee619e07a7644 100644
--- a/locale/core/pl/LC_MESSAGES/messages.po
+++ b/locale/core/pl/LC_MESSAGES/messages.po
@@ -630,7 +630,7 @@ msgstr "BÅ‚Ä…d krytyczny"
 #: html/password.php:58 html/index.php:144
 #, fuzzy, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
-msgstr "Nie można czytać pliku konfiguracji %s/gosa.conf. Kończę."
+msgstr "Nie można czytać pliku konfiguracji %s/fusiondirectory.conf. Kończę."
 
 #: html/password.php:74 html/index.php:144 html/index.php:216
 #: html/main.php:268
@@ -722,7 +722,7 @@ msgstr "Sesja nie jest szyfrowana!"
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
 
@@ -984,7 +984,7 @@ msgid ""
 "set."
 msgstr ""
 "Funkcjonalność snapshot jest włączona, lecz wymagana zmienna '%s' nie jest "
-"skonfigurowana w gosa.conf."
+"skonfigurowana w fusiondirectory.conf."
 
 #: include/class_SnapshotHandler.inc:59 include/class_config.inc:1160
 #, fuzzy, php-format
@@ -993,7 +993,7 @@ msgid ""
 "is missing. Please install '%s'."
 msgstr ""
 "Funkcjonalność snapshot jest włączona, lecz wymagana zmienna '%s' nie jest "
-"skonfigurowana w gosa.conf."
+"skonfigurowana w fusiondirectory.conf."
 
 #: include/class_acl.inc:27
 msgid "Access control"
@@ -1362,7 +1362,7 @@ msgid ""
 "administrator!"
 msgstr ""
 "Nie można pobrać informacji o blokadach w bazie LDAP. Proszę sprawdzić wpis "
-"'config' w gosa.conf!"
+"'config' w fusiondirectory.conf!"
 
 #: include/functions.inc:825
 #, fuzzy, php-format
@@ -1846,7 +1846,7 @@ msgstr "%s%% trafień w pliku %s"
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
 
@@ -2527,8 +2527,8 @@ msgstr "Nieznany wpis  '%s'!"
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "BÅ‚Ä…d XML w pliku gosa.conf: %s w linii %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr "BÅ‚Ä…d XML w pliku fusiondirectory.conf: %s w linii %d"
 
 #: include/class_config.inc:318
 #, fuzzy
@@ -5440,12 +5440,12 @@ msgstr "Plik konfiguracyjny"
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
-msgstr "Nie można czytać pliku konfiguracji %s/gosa.conf. Kończę."
+msgstr "Nie można czytać pliku konfiguracji %s/fusiondirectory.conf. Kończę."
 
 #: setup/class_setupStep_Finish.inc:106
 #, fuzzy
 msgid "The configuration is currently not readable or it does not exists."
-msgstr "Nie można czytać pliku konfiguracji %s/gosa.conf. Kończę."
+msgstr "Nie można czytać pliku konfiguracji %s/fusiondirectory.conf. Kończę."
 
 #: setup/class_setupStep_Finish.inc:115
 #, fuzzy, php-format
@@ -8291,10 +8291,10 @@ msgstr "Automatycznie"
 
 #, fuzzy
 #~ msgid ""
-#~ "Setting for SMBHASH in gosa.conf is incorrect! Cannot change Samba "
+#~ "Setting for SMBHASH in fusiondirectory.conf is incorrect! Cannot change Samba "
 #~ "password."
 #~ msgstr ""
-#~ "Parametr SMBHASH w gosa.conf jest nieprawidłowy! Nie można zmienić hasła "
+#~ "Parametr SMBHASH w fusiondirectory.conf jest nieprawidłowy! Nie można zmienić hasła "
 #~ "Samba."
 
 #, fuzzy
diff --git a/locale/core/pt/LC_MESSAGES/messages.po b/locale/core/pt/LC_MESSAGES/messages.po
index a2c1de605df60964089eb503b2dd24a416213895..41811420c7d73b13ac29e859df4a5cc7dfc3613b 100644
--- a/locale/core/pt/LC_MESSAGES/messages.po
+++ b/locale/core/pt/LC_MESSAGES/messages.po
@@ -691,7 +691,7 @@ msgstr ""
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
 
@@ -1766,10 +1766,10 @@ msgstr ""
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
-"A configuração do fuso horário '%s' no gosa.conf não é válida. Não foi "
+"A configuração do fuso horário '%s' no fusiondirectory.conf não é válida. Não foi "
 "possível calcular o intervalo do fuso horário corretamente."
 
 #: include/utils/class_xml.inc:48
@@ -2421,8 +2421,8 @@ msgstr ""
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "Erro de XML no gosa.conf: %s na linha %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr "Erro de XML no fusiondirectory.conf: %s na linha %d"
 
 #: include/class_config.inc:318
 msgid "Cannot bind to LDAP. Please contact the system administrator."
diff --git a/locale/core/ru/LC_MESSAGES/messages.po b/locale/core/ru/LC_MESSAGES/messages.po
index aa3270503873f11e83d2c6ae73a04a321ba1cea2..e1a59433dcec94df7b594fadc92776dd8ec81de6 100644
--- a/locale/core/ru/LC_MESSAGES/messages.po
+++ b/locale/core/ru/LC_MESSAGES/messages.po
@@ -648,7 +648,7 @@ msgstr "Терминал-сервер"
 #, fuzzy, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr ""
-"Не удается прочитать файл настройки GOsa %s/gosa.conf. Операция прервана."
+"Не удается прочитать файл настройки GOsa %s/fusiondirectory.conf. Операция прервана."
 
 #: html/password.php:74 html/index.php:144 html/index.php:216
 #: html/main.php:268
@@ -742,7 +742,7 @@ msgstr "Данные, передаваемые в течение этого се
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
 
@@ -1413,7 +1413,7 @@ msgid ""
 "administrator!"
 msgstr ""
 "Не удается считать блокировку в базе данных LDAP. Проверьте, раздел \"config"
-"\" в файле gosa.conf!"
+"\" в файле fusiondirectory.conf!"
 
 #: include/functions.inc:825
 #, fuzzy, php-format
@@ -1897,7 +1897,7 @@ msgstr ""
 #: include/functions_helpviewer.inc:45
 #, fuzzy, php-format
 msgid "XML error in guide.xml: %s at line %d"
-msgstr "Ошибка XML в gosa.conf: %s в строке %d"
+msgstr "Ошибка XML в fusiondirectory.conf: %s в строке %d"
 
 #: include/functions_helpviewer.inc:88
 msgid "No help available for this plugin."
@@ -1916,7 +1916,7 @@ msgstr ""
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
 
@@ -2604,8 +2604,8 @@ msgstr "состояние неизвестно"
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "Ошибка XML в gosa.conf: %s в строке %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr "Ошибка XML в fusiondirectory.conf: %s в строке %d"
 
 #: include/class_config.inc:318
 #, fuzzy
@@ -5641,13 +5641,13 @@ msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
 msgstr ""
-"Не удается прочитать файл настройки GOsa %s/gosa.conf. Операция прервана."
+"Не удается прочитать файл настройки GOsa %s/fusiondirectory.conf. Операция прервана."
 
 #: setup/class_setupStep_Finish.inc:106
 #, fuzzy
 msgid "The configuration is currently not readable or it does not exists."
 msgstr ""
-"Не удается прочитать файл настройки GOsa %s/gosa.conf. Операция прервана."
+"Не удается прочитать файл настройки GOsa %s/fusiondirectory.conf. Операция прервана."
 
 #: setup/class_setupStep_Finish.inc:115
 #, fuzzy, php-format
@@ -5657,7 +5657,7 @@ msgid ""
 "shouldn't. You may want to execute these commands to achieve this "
 "requirement:"
 msgstr ""
-"Поместив файл gosa.conf в каталог /etc/gosa, убедитесь, что только "
+"Поместив файл fusiondirectory.conf в каталог /etc/gosa, убедитесь, что только "
 "пользователь веб-сервера может его читать. Для этого вам, возможно, "
 "понадобится выполнить следующие команды:"
 
@@ -8457,10 +8457,10 @@ msgstr "автоматически"
 
 #, fuzzy
 #~ msgid ""
-#~ "Setting for SMBHASH in gosa.conf is incorrect! Cannot change Samba "
+#~ "Setting for SMBHASH in fusiondirectory.conf is incorrect! Cannot change Samba "
 #~ "password."
 #~ msgstr ""
-#~ "Параметр SMBHASH в gosa.conf некорректен! Не удается сменить пароль Samba."
+#~ "Параметр SMBHASH в fusiondirectory.conf некорректен! Не удается сменить пароль Samba."
 
 #, fuzzy
 #~ msgid "User delted"
diff --git a/locale/core/vi/LC_MESSAGES/messages.po b/locale/core/vi/LC_MESSAGES/messages.po
index 35f4ce6a9cba78cbe69f921f271c0ec36d31bf8f..35d47824d386a5b6e4cf2cabe7cb2eb9f7100f1b 100644
--- a/locale/core/vi/LC_MESSAGES/messages.po
+++ b/locale/core/vi/LC_MESSAGES/messages.po
@@ -742,10 +742,10 @@ msgstr "Phiên không được mã hóa!"
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
-"Thời gian hạn định của phiên được cấu hình trong file gosa.conf của bạn sẽ "
+"Thời gian hạn định của phiên được cấu hình trong file fusiondirectory.conf của bạn sẽ "
 "được ghi đè lên bởi các thiết lập php.ini."
 
 #: html/index.php:165
@@ -1875,10 +1875,10 @@ msgstr "%s%% tỷ lệ hit trong file %s"
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
-"Múi giờ thiết lập '%s' trong gosa.config không hợp lệ. Không thể tính toán "
+"Múi giờ thiết lập '%s' trong fusiondirectory.config không hợp lệ. Không thể tính toán "
 "chính xác thời gian bù thêm vào múi giờ."
 
 #: include/utils/class_xml.inc:48
@@ -2540,8 +2540,8 @@ msgstr "Không thể xóa entry %s!"
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "Lỗi XML trong gosa.conf: %s tại dòng %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr "Lỗi XML trong fusiondirectory.conf: %s tại dòng %d"
 
 #: include/class_config.inc:318
 msgid "Cannot bind to LDAP. Please contact the system administrator."
diff --git a/locale/core/zh/LC_MESSAGES/messages.po b/locale/core/zh/LC_MESSAGES/messages.po
index e17df63d5aeff5929aedc29d03879860638190c4..f6df44fa571d9c0ea0998475464fbd3f4787336e 100644
--- a/locale/core/zh/LC_MESSAGES/messages.po
+++ b/locale/core/zh/LC_MESSAGES/messages.po
@@ -634,7 +634,7 @@ msgstr "终端服务器"
 #: html/password.php:58 html/index.php:144
 #, fuzzy, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
-msgstr "GOsa 配置 %s/gosa.conf 不可读取。退出。"
+msgstr "GOsa 配置 %s/fusiondirectory.conf 不可读取。退出。"
 
 #: html/password.php:74 html/index.php:144 html/index.php:216
 #: html/main.php:268
@@ -728,7 +728,7 @@ msgstr "会话不会被加密。"
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
 
@@ -1377,7 +1377,7 @@ msgstr ""
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr "无法获得 LDAP 数据库的锁信息。检查 gosa.conf 中的 'config' 条目！"
+msgstr "无法获得 LDAP 数据库的锁信息。检查 fusiondirectory.conf 中的 'config' 条目！"
 
 #: include/functions.inc:825
 #, fuzzy, php-format
@@ -1862,7 +1862,7 @@ msgstr "%s%% 点击率于文件 %s"
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
 
@@ -2539,8 +2539,8 @@ msgstr "未知 FAIstate %s"
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "XML 出错于 gosa.conf: %s ，行 %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr "XML 出错于 fusiondirectory.conf: %s ，行 %d"
 
 #: include/class_config.inc:318
 #, fuzzy
@@ -5491,12 +5491,12 @@ msgstr "需要 XML 功能来解析配置文件。"
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
-msgstr "GOsa 配置 %s/gosa.conf 不可读取。退出。"
+msgstr "GOsa 配置 %s/fusiondirectory.conf 不可读取。退出。"
 
 #: setup/class_setupStep_Finish.inc:106
 #, fuzzy
 msgid "The configuration is currently not readable or it does not exists."
-msgstr "GOsa 配置 %s/gosa.conf 不可读取。退出。"
+msgstr "GOsa 配置 %s/fusiondirectory.conf 不可读取。退出。"
 
 #: setup/class_setupStep_Finish.inc:115
 #, fuzzy, php-format
@@ -8282,9 +8282,9 @@ msgstr "自动"
 
 #, fuzzy
 #~ msgid ""
-#~ "Setting for SMBHASH in gosa.conf is incorrect! Cannot change Samba "
+#~ "Setting for SMBHASH in fusiondirectory.conf is incorrect! Cannot change Samba "
 #~ "password."
-#~ msgstr "在 gosa.conf 中 SMBHASH 的设置不正确！无法修改 Samba 口令。"
+#~ msgstr "在 fusiondirectory.conf 中 SMBHASH 的设置不正确！无法修改 Samba 口令。"
 
 #, fuzzy
 #~ msgid "User delted"
diff --git a/redhat/fusiondirectory.spec b/redhat/fusiondirectory.spec
index 69205dbb10c33868bb7e12f495d3d63e363f964d..45155d6a502c4dd56ae2fa7cede0e41b22592160 100644
--- a/redhat/fusiondirectory.spec
+++ b/redhat/fusiondirectory.spec
@@ -195,7 +195,7 @@ mkdir -p %{buildroot}/usr/share/doc/fusiondirectory
 mkdir -p %{buildroot}%{webconf}
 
 touch %{buildroot}/etc/gosa/gosa.secrets
-mv contrib/gosa.conf		%{buildroot}/usr/share/doc/fusiondirectory
+mv contrib/fusiondirectory.conf		%{buildroot}/usr/share/doc/fusiondirectory
 mv update-gosa 			%{buildroot}/usr/sbin
 mv bin/gosa-encrypt-passwords 	%{buildroot}/usr/sbin
 mv debian/gosa-apache.conf 	%{buildroot}%{webconf}
@@ -275,8 +275,8 @@ done
 mv ./*.1.gz 			%{buildroot}/usr/share/man/man1/
 gzip -c contrib/gosa.1 > contrib/gosa.1.gz
 mv contrib/gosa.1.gz 		%{buildroot}/usr/share/man/man1/
-gzip -c contrib/gosa.conf.5 > contrib/gosa.conf.5.gz
-mv contrib/gosa.conf.5.gz 		%{buildroot}/usr/share/man/man5/
+gzip -c contrib/fusiondirectory.conf.5 > contrib/fusiondirectory.conf.5.gz
+mv contrib/fusiondirectory.conf.5.gz 		%{buildroot}/usr/share/man/man5/
 
 mkdir -p %{buildroot}/usr/share/doc/fusiondirectory-%{version}
 rm -rf %{buildroot}/usr/share/gosa/contrib
@@ -309,13 +309,13 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %doc %attr(-,root,root) AUTHORS README README.safemode Changelog COPYING INSTALL FAQ CODING
-%config %attr(-,root,root) /usr/share/doc/fusiondirectory/gosa.conf
+%config %attr(-,root,root) /usr/share/doc/fusiondirectory/fusiondirectory.conf
 #%attr(-,root,root) /contrib/openldap
 %config %attr(-,root,root) /usr/share/doc/fusiondirectory/slapd.conf-example
 %attr(755,root,root) /usr/sbin/update-gosa
 %attr(755,root,root) /usr/share/man/man1/gosa-encrypt-passwords.1.gz
 %attr(755,root,root) /usr/share/man/man1/update-gosa.1.gz
-%attr(755,root,root) /usr/share/man/man5/gosa.conf.5.gz
+%attr(755,root,root) /usr/share/man/man5/fusiondirectory.conf.5.gz
 %attr(644,root,root) /etc/gosa/shells
 %attr(644,root,root) /etc/gosa/encodings
 %attr(755,root,root) /usr/sbin/gosa-encrypt-passwords
diff --git a/redhat/fusiondirectory_fedora.spec b/redhat/fusiondirectory_fedora.spec
index b8941cca46d98ffe5b414dac61e41938a107daab..d317c6b2d94b2235f429708a44247f338e754d8c 100644
--- a/redhat/fusiondirectory_fedora.spec
+++ b/redhat/fusiondirectory_fedora.spec
@@ -173,7 +173,7 @@ mkdir -p %{buildroot}/usr/share/doc/fusiondirectory
 mkdir -p %{buildroot}%{webconf}
 
 touch %{buildroot}%{_sysconfdir}/gosa/gosa.secrets
-mv contrib/gosa.conf		%{buildroot}/usr/share/doc/fusiondirectory
+mv contrib/fusiondirectory.conf		%{buildroot}/usr/share/doc/fusiondirectory
 mv update-gosa 			%{buildroot}%{_sbindir}
 mv bin/gosa-encrypt-passwords 	%{buildroot}%{_sbindir}
 mv debian/gosa-apache.conf 	%{buildroot}%{webconf}
@@ -239,8 +239,8 @@ done
 mv ./*.1.gz 			%{buildroot}/usr/share/man/man1/
 gzip -c contrib/gosa.1 > contrib/gosa.1.gz
 mv contrib/gosa.1.gz 		%{buildroot}/usr/share/man/man1/
-gzip -c contrib/gosa.conf.5 > contrib/gosa.conf.5.gz
-mv contrib/gosa.conf.5.gz 		%{buildroot}/usr/share/man/man5/
+gzip -c contrib/fusiondirectory.conf.5 > contrib/fusiondirectory.conf.5.gz
+mv contrib/fusiondirectory.conf.5.gz 		%{buildroot}/usr/share/man/man5/
 
 mkdir -p %{buildroot}/usr/share/doc/fusiondirectory-%{version}
 rm -rf %{buildroot}/usr/share/gosa/contrib
@@ -273,13 +273,13 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %doc %attr(-,root,root) AUTHORS README README.safemode Changelog COPYING INSTALL FAQ CODING
-%config %attr(-,root,root) /usr/share/doc/fusiondirectory/gosa.conf
+%config %attr(-,root,root) /usr/share/doc/fusiondirectory/fusiondirectory.conf
 #%attr(-,root,root) /contrib/openldap
 %config %attr(-,root,root) /usr/share/doc/fusiondirectory/slapd.conf-example
 %attr(755,root,root) %{_sbindir}/update-gosa
 %attr(755,root,root) /usr/share/man/man1/gosa-encrypt-passwords.1.gz
 %attr(755,root,root) /usr/share/man/man1/update-gosa.1.gz
-%attr(755,root,root) /usr/share/man/man5/gosa.conf.5.gz
+%attr(755,root,root) /usr/share/man/man5/fusiondirectory.conf.5.gz
 %attr(644,root,root) %{_sysconfdir}/gosa/shells
 %attr(644,root,root) %{_sysconfdir}/gosa/encodings
 %attr(755,root,root) %{_sbindir}/gosa-encrypt-passwords
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index a27c2b27d8fae3cc575385ba37066e9403af9d7e..8db47d604238f9f94130dc74d34472a3d57a2763 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -48,7 +48,7 @@ class setup
     $this->o_steps[$i++] = new Step_Finish();
     $this->i_steps = $i-1;
 
-    /* Ensure that setup is not reachable if gosa.conf (CONFIG_FILE) */
+    /* Ensure that setup is not reachable if fusiondirectory.conf (CONFIG_FILE) */
     if(file_exists(CONFIG_DIR."/".CONFIG_FILE)){
       session::destroy();
       header("Location: index.php")    ;
diff --git a/setup/class_setupStep_Finish.inc b/setup/class_setupStep_Finish.inc
index ea7782f07ecdc7b5dcc812f8e0367e93e27d69b1..f3dfa34107dc1d957051e904dc9279ba81028ba3 100644
--- a/setup/class_setupStep_Finish.inc
+++ b/setup/class_setupStep_Finish.inc
@@ -22,7 +22,7 @@
 
 class Step_Finish extends setup_step
 {
-  var $gosa_conf_contrib   = "/gosa.conf";
+  var $gosa_conf_contrib   = "/fusiondirectory.conf";
   var $cfg_file_written = FALSE;
   var $header_image = "images/setup/server.png";
 
@@ -60,12 +60,12 @@ class Step_Finish extends setup_step
       $webgroup = $info['name'];
     }
 
-    /* Check if there is currently an active gosa.conf 
+    /* Check if there is currently an active fusiondirectory.conf 
      */
     $exists = file_exists(CONFIG_DIR."/".CONFIG_FILE); 
 
     /* Redirect to GOsa login, if : 
-     *   - gosa.conf exists
+     *   - fusiondirectory.conf exists
      *   - Permisssion are set correctly 
      */ 
     if(isset($_POST['next']) && $exists && !$this->is_world_readable(CONFIG_DIR."/".CONFIG_FILE)){