Merge pull request #138 from SaberUK/master+always-anope

Use "anope" everywhere instead of "services". 

25 files changed, 66 insertions, 72 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 974988b67..be2b38261 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,13 +101,7 @@ if(CMAKE_DL_LIBS)
 endif(CMAKE_DL_LIBS)
 
 if(NOT PROGRAM_NAME)
-  # Under Windows, we set the executable name for Anope to be anope
-  if(WIN32)
-    set(PROGRAM_NAME anope)
-  # Under *nix, we set the executable name for Anope to be services
-  else(WIN32)
-    set(PROGRAM_NAME services)
-  endif(WIN32)
+  set(PROGRAM_NAME anope)
 endif(NOT PROGRAM_NAME)
 
 # If we are not using Visual Studio, we'll run the following checks
@@ -180,7 +174,7 @@ find_program(CHMOD chmod)
 if(INSTDIR)
   set(CMAKE_INSTALL_PREFIX "${INSTDIR}")
 elseif(NOT CMAKE_INSTALL_PREFIX)
-  set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/services")
+  set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/anope")
 endif(INSTDIR)
 
 # Set default paths for various directories if not already defined
diff --git a/Config b/Config
index 1b869cdd0..4102e1c3e 100755
--- a/Config
+++ b/Config
@@ -108,7 +108,7 @@ export ECHO2 ECHO2SUF
 # Init values
 ###########################################################################
 
-INSTDIR=$HOME/services
+INSTDIR=$HOME/anope
 RUNGROUP=
 UMASK=
 DEBUG="no"
diff --git a/data/example.conf b/data/anope.example.conf
index 6843c8021..a09ce2378 100644
--- a/data/example.conf
+++ b/data/anope.example.conf
@@ -1,8 +1,8 @@
 /*
  * Example configuration file for Services. After making the appropriate
  * changes to this file, place it in the Services conf directory (as
- * specified in the "configure" script, default /home/username/services/conf)
- * under the name "services.conf".
+ * specified in the "configure" script, default /home/username/anope/conf)
+ * under the name "anope.conf".
  *
  * The format of this file is fairly simple: three types of comments are supported:
  *  - All text after a '#' on a line is ignored, as in shell scripting
@@ -110,7 +110,7 @@ define
 #include
 {
 	type = "executable"
-	name = "/usr/bin/wget -q -O - http://some.misconfigured.network.com/services.conf"
+	name = "/usr/bin/wget -q -O - http://some.misconfigured.network.com/anope.conf"
 }
 
 /*
@@ -231,13 +231,13 @@ serverinfo
 	 * The filename containing the Services process ID. The path is relative to the
 	 * services root directory.
 	 */
-	pid = "data/services.pid"
+	pid = "data/anope.pid"
 
 	/*
 	 * The filename containing the Message of the Day. The path is relative to the
 	 * services root directory.
 	 */
-	motd = "conf/services.motd"
+	motd = "conf/motd.txt"
 }
 
 /*
diff --git a/data/example.chk b/data/example.chk
index 119b1ca99..e71928f1c 100644
--- a/data/example.chk
+++ b/data/example.chk
@@ -9,16 +9,16 @@
 ###############################################################
 
 # Anope binary directory
-ANOPATH=/home/ircd/services/bin
+ANOPATH=/home/ircd/anope/bin
 
 # Anope data directory
-ANODATA=/home/ircd/services/data
+ANODATA=/home/ircd/anope/data
 
 # Name of the pid file
-ANOPIDF=services.pid
+ANOPIDF=anope.pid
 
 # Name of the executable
-ANOPROG=services
+ANOPROG=anope
 
 # Parameters to pass to the executable
 ANOARGS=""
diff --git a/data/modules.example.conf b/data/modules.example.conf
index 7048e5e43..10c6255f9 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -695,7 +695,7 @@ module { name = "help" }
 
 	/* Query to execute to determine if a user should have operator privileges.
 	 * A field named opertype must be returned in order to link the user to their oper type.
-	 * The oper types must be configured earlier in services.conf.
+	 * The oper types must be configured earlier in anope.conf.
 	 *
 	 * If a field named modes is returned from this query then those modes are set on the user.
 	 * Without this, only a simple +o is sent.
diff --git a/data/operserv.example.conf b/data/operserv.example.conf
index 1c83bede1..9b5c166ff 100644
--- a/data/operserv.example.conf
+++ b/data/operserv.example.conf
@@ -523,7 +523,7 @@ command { service = "OperServ"; name = "OPER"; command = "operserv/oper"; permis
  *
  * Provides the command operserv/reload.
  *
- * Used to reload the services.conf configuration file.
+ * Used to reload the anope.conf configuration file.
  */
 module { name = "operserv/reload" }
 command { service = "OperServ"; name = "RELOAD"; command = "operserv/reload"; permission = "operserv/reload"; }
diff --git a/docs/INSTALL b/docs/INSTALL
index 0a923ef97..071483b08 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -52,8 +52,8 @@ Note: You should also read the README and FAQ files!
     cause trouble on your network if passwords are not encrypted, or read
     the memos of any user.
 
-    Now go into the conf directory (by default, ~/services/conf). Copy the example
-    configuration file (example.conf) to services.conf, and open the latter
+    Now go into the conf directory (by default, ~/anope/conf). Copy the example
+    configuration file (anope.example.conf) to anope.conf, and open the latter
     with your favorite text editor. It contains all the configuration
     directives Anope will use at startup. Read the instructions contained in
     the file carefully. Using the default values is NOT a good idea, and will
@@ -71,7 +71,7 @@ Note: You should also read the README and FAQ files!
 
         * IMPORTANT: Back up your old databases!
         * If you are upgrading to a new major release, ALWAYS restart a
-          fresh configuration file from example.conf.
+          fresh configuration file from anope.example.conf.
 
 3) Setting up the IRCd
 
@@ -83,7 +83,7 @@ Note: You should also read the README and FAQ files!
     a shared block), and be sure that the IRCd is listneing on the given port
     in the link block.
 
-    Example link configurations can be found in example.conf for some of the
+    Example link configurations can be found in anope.example.conf for some of the
     popular IRCds.
 
     Don't forget to /rehash your IRCd to apply changes.
@@ -95,7 +95,7 @@ Note: You should also read the README and FAQ files!
 4) Starting Anope
 
     Go into the directory where binaries were installed (by default, this is
-    ~/services/bin). Type ./services to launch Anope.
+    ~/anope/bin). Type ./anope to launch Anope.
 
     If there are syntax errors in the configuration file they will be
     displayed on the screen. Correct them until there are no errors anymore.
@@ -104,7 +104,7 @@ Note: You should also read the README and FAQ files!
     Give Services at least one minute to link to your network, as certain
     IRCds on some OSes may be really slow for the link process. If nothing
     happens after about a minute, it is probably a configuration problem. Try
-    to launch Anope with ./services -debug -nofork to see any errors that it
+    to launch Anope with ./anope -debug -nofork to see any errors that it
     encounters, and try to correct them.
 
     If you need help to solve errors, feel free to subscribe to the Anope
@@ -116,7 +116,7 @@ Note: You should also read the README and FAQ files!
     still running, and restart it if not.
 
     First rename the example.chk script that is in Anope path (by default,
-    this is ~/services/conf) to services.chk and edit it. You'll need to 
+    this is ~/anope/conf) to services.chk and edit it. You'll need to 
     modify the CONFIGURATION part of the file. Then ensure that the file is 
     marked as executable by typing chmod +x services.chk, and try to launch the
     script to see if it works (Anope must not be running when you do this ;))
@@ -125,7 +125,7 @@ Note: You should also read the README and FAQ files!
     This will open the default text editor with the crontab file. Enter the
     following (with correct path):
 
-        */5 * * * * /home/ircd/services/conf/services.chk >/dev/null 2>&1
+        */5 * * * * /home/ircd/anope/conf/services.chk >/dev/null 2>&1
 
     The */5 at the beginning means "check every 5 minutes". You may replace
     the 5 with other another number if you want (but less than 60). Consult
diff --git a/docs/INSTALL.fr b/docs/INSTALL.fr
index f7af3aac8..4cb453d35 100644
--- a/docs/INSTALL.fr
+++ b/docs/INSTALL.fr
@@ -55,9 +55,9 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     mots de passe ne sont pas chiffrés, ou lire les mémos de tous les
     utilisateurs.
 
-    Allez maintenant dans le répertoire conf (par défaut, ~/services/conf).
-    Copiez l'exemple de fichier de configuration (example.conf) en
-    services.conf et ouvrez ce dernier avec votre éditeur de texte favori.
+    Allez maintenant dans le répertoire conf (par défaut, ~/anope/conf).
+    Copiez l'exemple de fichier de configuration (anope.example.conf) en
+    anope.conf et ouvrez ce dernier avec votre éditeur de texte favori.
     Il contient toutes les directives de configuration qu'Anope va utiliser
     en démarrant. Lisez attentivement les instructions contenues dans le
     fichier. L'utilisation des valeurs par défaut n'est pas toujours
@@ -78,7 +78,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
         * IMPORTANT : Sauvegardez vos anciennes bases de données !
         * Si vous mettez à jour vers une nouvelle version majeure,
           recommencez *toujours* toute votre configuration à partir du
-          fichier example.conf.
+          fichier anope.example.conf.
 
 3) Configuration de l'IRCd
 
@@ -92,7 +92,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     sur le port donné dans le bloc link.
 
     Des exemples de configurations de bloc link peuvent être trouvés dans
-    le fichier example.conf pour certains des IRCd les plus populaires.
+    le fichier anope.example.conf pour certains des IRCd les plus populaires.
 
     Souvenez-vous de /rehash votre IRCd pour appliquer les changements.
 
@@ -104,7 +104,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
 4) Mettre en route Anope
 
     Allez dans le répertoire où les fichiers binaires ont été installés
-    (par défaut, ~/services/bin). Tapez ./services pour lancer Anope.
+    (par défaut, ~/anope/bin). Tapez ./anope pour lancer Anope.
 
     S'il y a des erreurs de syntaxe dans le fichier de configuration, elles 
     seront affichées à l'écran. Corrigez-les jusqu'à ce qu'il n'y en ait
@@ -114,7 +114,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     réseau, car certains IRCds sur certains systèmes peuvent être très
     lents pour le processus de liaison. Si rien ne se passe après environ
     une minute, il y a probablement un problème de configuration. Essayez
-    de lancer Anope en mode debug avec ./services -debug -nofork pour voir
+    de lancer Anope en mode debug avec ./anope -debug -nofork pour voir
     toutes les erreurs rencontrées et essayez de les corriger.
 
     Si vous avez besoin d'aide pour résoudre des erreurs, n'hésitez pas à
@@ -127,7 +127,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     est toujours en cours d'exécution et de le redémarrer s'il n'est pas.
 
     D'abord renommez le script example.chk qui est dans les dossiers
-    d'Anope (par défaut, ~/services/conf) en services.chk et modifiez-le.
+    d'Anope (par défaut, ~/anope/conf) en services.chk et modifiez-le.
     Vous aurez besoin de modifier la partie CONFIGURATION du fichier.
     Assurez-vous ensuite que le fichier est marqué comme exécutable en
     tapant chmod +x services.chk et essayez de lancer le script pour voir
@@ -138,7 +138,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     crontab -e. Cela va ouvrir l'éditeur de texte par défaut avec le
     fichier crontab. Entrez la ligne suivante (avec le chemin correct) :
 
-        */5 * * * * /home/ircd/services/conf/services.chk > /dev/null 2>&1
+        */5 * * * * /home/ircd/anope/conf/services.chk > /dev/null 2>&1
 
     Le */5 au début signifie "vérifier toutes les 5 minutes". Vous pouvez
     remplacer le 5 par un autre numéro si vous voulez (mais moins de 60).
diff --git a/docs/LANGUAGE b/docs/LANGUAGE
index 33fa240fd..24c47124f 100644
--- a/docs/LANGUAGE
+++ b/docs/LANGUAGE
@@ -25,7 +25,7 @@ Anope Mutli Language Support
     Anope uses gettext (http://www.gnu.org/software/gettext/) to translate messages for users. To add a new language
     install gettext and run `msginit -l language -o anope.language.po -i anope.pot`. For example if I was translating to
     Spanish I could run `msginit -l es_ES -o anope.es_ES.po -i anope.pot`. Open the newly generating .po file and start
-    translating. Once you are done simply rerun ./Config; make && make install and add the language to your services.conf.
+    translating. Once you are done simply rerun ./Config; make && make install and add the language to your anope.conf.
     Note that on Windows it is not quite this simple, windows.cpp must be edited and Anope recompiled and restarted.
 
     Poedit (http://www.poedit.net/) is a popular po file editor, and we recommend using it or another editor designed to edit
diff --git a/docs/MODULES b/docs/MODULES
index f7997547b..e73412627 100644
--- a/docs/MODULES
+++ b/docs/MODULES
@@ -22,7 +22,7 @@ Anope Modules
     1. If modules are supported by your system, they will be configured
        automatically when you run ./Config. The modules will be installed
        to the modules directory in your data path (by default this will
-       be ~/services/data/modules).
+       be ~/anope/data/modules).
 
     2. Compile Anope as usual using ./Config. The "make" process will now
        compile module support into Anope, and compile the default sample
@@ -98,7 +98,7 @@ Anope Modules
     1. Make sure you're in the main source directory. (usually anope-1.X.XX/)
     2. Run ./Config to find and configure modules, then `cd build`.
     3. Run `make` to compile Anope, and any modules.
-    4. Run `make install` to copy the compiled binaries to the ~/services/
+    4. Run `make install` to copy the compiled binaries to the ~/anope/
        directory.
 
     You can now use /msg OperServ MODLOAD to load the new modules.
diff --git a/docs/TOOLS b/docs/TOOLS
index c8e92fc70..26fe9e9ed 100644
--- a/docs/TOOLS
+++ b/docs/TOOLS
@@ -8,12 +8,12 @@ Anope Bundled Tools
 
     The SMTP client can be used instead of sendmail for use with Anope's mail
     options. To use the SMTP client instead of sendmail, find the line in your
-    services configuration file (services.conf) that defines sendmailpath. On
+    services configuration file (anope.conf) that defines sendmailpath. On
     that line, change the path to your services installation directory, then
     followed by "bin/anopesmtp" and the IP address of a valid SMTP server. It
     should look like this:
 
-        sendmailpath = "/home/anope/services/bin/anopesmtp 127.0.0.1"
+        sendmailpath = "/home/ircd/anope/bin/anopesmtp 127.0.0.1"
 
     If the SMTP client doesn't send mail, or if there's an other problem with
     it, you can enable debug mode by passing the --debug flag after the server
diff --git a/docs/WIN32.txt b/docs/WIN32.txt
index 071831995..9c3ce91f7 100644
--- a/docs/WIN32.txt
+++ b/docs/WIN32.txt
@@ -103,7 +103,7 @@ Anope for Windows
        INSTALL within the Solution Explorer. Right-click on INSTALL and choose Build.

 

        When you have done this, all the files will be installed to where they belong.

-       The only thing you need to do is rename "data/example.conf" to be "data/services.conf",

+       The only thing you need to do is rename "data/anope.example.conf" to be "data/anope.conf",

        and then follow the steps to set up Anope.

 

     You have now completed the building phase of Anope for Windows. You can

@@ -120,7 +120,7 @@ Anope for Windows
     Notepad will cause strange characters to appear, and you may not be able to

     edit the file correctly.

 

-    Open services.conf, and read through it carefully and adjust the settings

+    Open anope.conf, and read through it carefully and adjust the settings

     you think you need to adjust.

 

     If you are unsure of the settings, you can go to the dos command prompt

diff --git a/include/anope.h b/include/anope.h
index f6e864300..e41fd55e6 100644
--- a/include/anope.h
+++ b/include/anope.h
@@ -364,7 +364,7 @@ namespace Anope
 	 */
 	extern CoreExport bool ReadOnly, NoFork, NoThird, NoExpire, ProtocolDebug;
 
-	/** The root of the services installation. Usually ~/services
+	/** The root of the services installation. Usually ~/anope
 	 */
 	extern CoreExport Anope::string ServicesDir;
 
diff --git a/include/language.h b/include/language.h
index c7bb6d689..6201a5cb5 100644
--- a/include/language.h
+++ b/include/language.h
@@ -12,7 +12,7 @@
 namespace Language
 {
 
-	/* Languages we support as configured in services.conf. They are
+	/* Languages we support as configured in anope.conf. They are
 	 * added to this list if we detect a language exists in the correct
 	 * location for each language.
 	 */
diff --git a/language/anope.ca_ES.po b/language/anope.ca_ES.po
index 87daa1e2b..33fa5bffd 100644
--- a/language/anope.ca_ES.po
+++ b/language/anope.ca_ES.po
@@ -4841,7 +4841,7 @@ msgstr ""
 "to them.  (However, no more than %d messages will be\n"
 "sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
@@ -4863,7 +4863,7 @@ msgstr ""
 "be sent to them.  (However, no more than %d messages will\n"
 "be sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
@@ -9067,7 +9067,7 @@ msgstr "Sucessor de %s desabilitat."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "SuperAdmin setting not enabled in services.conf"
+msgstr "SuperAdmin setting not enabled in anope.conf"
 
 #: modules/commands/ns_suspend.cpp:60
 #, fuzzy
diff --git a/language/anope.de_DE.po b/language/anope.de_DE.po
index af6a0102c..288a37eef 100644
--- a/language/anope.de_DE.po
+++ b/language/anope.de_DE.po
@@ -4526,7 +4526,7 @@ msgstr ""
 "angezeigt. (Es werden jedoch nur max. %d angezeigt, um ein\n"
 "Flooding des Users zu verhindern. Wenn mehr News\n"
 "existieren, werden nur die neuesten angezeigt.)\n"
-"NewsCount kann in der services.conf eingestellt werden.\n"
+"NewsCount kann in der anope.conf eingestellt werden.\n"
 "\n"
 "Diese Funktion ist beschränkt auf Services Operatoren."
 
@@ -4545,7 +4545,7 @@ msgstr ""
 "(Es werden jedoch nur max. %d Nachrichten angezeigt, um ein\n"
 "Flooding des Users zu verhindern. Wenn mehr News\n"
 "existieren, werden nur die neüsten angezeigt.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "Diese Funktion ist beschränkt auf Services Operatoren."
 
@@ -8708,7 +8708,7 @@ msgstr "Der Eintrag des Vertreters für %s wurde entfernt."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "SuperAdmin muss in der services.conf eingeschaltet werden."
+msgstr "SuperAdmin muss in der anope.conf eingeschaltet werden."
 
 #: modules/commands/ns_suspend.cpp:60
 #, fuzzy
diff --git a/language/anope.el_GR.po b/language/anope.el_GR.po
index d1b1aea73..1afa99c9b 100644
--- a/language/anope.el_GR.po
+++ b/language/anope.el_GR.po
@@ -4761,7 +4761,7 @@ msgstr ""
 "(Παρόλα αυτά, δεν θα του στέλνονται παραπάνω από #%d# μηνύματα\n"
 "για να αποφευχθεί το flood του χρήστη. Αν υπάρχουν\n"
 "περισσότερα μηνύματα, θα φαίνονται τα πιο πρόσφατα.)\n"
-"Το NewsCount μπορεί να ρυθμιστεί στο services.conf.\n"
+"Το NewsCount μπορεί να ρυθμιστεί στο anope.conf.\n"
 "\n"
 "Η εντολή LOGONNEWS μπορεί να χρησιμοποιηθεί μόνο από IRC Operators."
 
@@ -4784,7 +4784,7 @@ msgstr ""
 "μηνύματα\n"
 "για να αποφευχθεί flood στον χρήστη. Αν υπάρχουν \n"
 "περισσότερα μηνύματα, θα φαίνονται τα πιο πρόσφατα.)\n"
-"Το NewsCount μπορεί να ρυθμιστεί στο services.conf.\n"
+"Το NewsCount μπορεί να ρυθμιστεί στο anope.conf.\n"
 " \n"
 "Το OPERNEWS μπορεί να χρησιμοποιηθεί μόνο από Services Operators."
 
@@ -8975,7 +8975,7 @@ msgstr "Ο Successor του #%s# δεν έχει οριστεί."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "H ρύθμιση SuperAdmin δεν έχει ενεργοποιηθεί στο services.conf"
+msgstr "H ρύθμιση SuperAdmin δεν έχει ενεργοποιηθεί στο anope.conf"
 
 #
 #: modules/commands/ns_suspend.cpp:60
diff --git a/language/anope.hu_HU.po b/language/anope.hu_HU.po
index 1b6e3bf66..5e4dd3f7f 100644
--- a/language/anope.hu_HU.po
+++ b/language/anope.hu_HU.po
@@ -4803,7 +4803,7 @@ msgstr ""
 "to them.  (However, no more than %d messages will be\n"
 "sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
@@ -4825,7 +4825,7 @@ msgstr ""
 "be sent to them.  (However, no more than %d messages will\n"
 "be sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
@@ -8982,7 +8982,7 @@ msgstr "A megadott csatorna %s successora törölve."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "SuperAdmin setting not enabled in services.conf"
+msgstr "SuperAdmin setting not enabled in anope.conf"
 
 #: modules/commands/ns_suspend.cpp:60
 #, fuzzy
diff --git a/language/anope.it_IT.po b/language/anope.it_IT.po
index 4bed7ac42..c338191a0 100644
--- a/language/anope.it_IT.po
+++ b/language/anope.it_IT.po
@@ -8365,7 +8365,7 @@ msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
 msgstr ""
 "L'impostazione SuperAdmin non può essere attivata perchè non è abilitata in "
-"services.conf"
+"anope.conf"
 
 #: modules/commands/ns_suspend.cpp:60
 msgid "Suspend a given nick"
diff --git a/language/anope.pt_PT.po b/language/anope.pt_PT.po
index fe246a031..b9fef464d 100644
--- a/language/anope.pt_PT.po
+++ b/language/anope.pt_PT.po
@@ -4766,7 +4766,7 @@ msgstr ""
 "to them.  (However, no more than %s messages will be\n"
 "sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
@@ -4788,7 +4788,7 @@ msgstr ""
 "be sent to them.  (However, no more than %s messages will\n"
 "be sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
@@ -8938,7 +8938,7 @@ msgstr "Successor do canal %s removido."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "Opção SuperAdmin não habilitada no arquivo services.conf"
+msgstr "Opção SuperAdmin não habilitada no arquivo anope.conf"
 
 #: modules/commands/ns_suspend.cpp:60
 #, fuzzy
diff --git a/language/anope.ru_RU.po b/language/anope.ru_RU.po
index 0890a9613..0b3d4ddb5 100644
--- a/language/anope.ru_RU.po
+++ b/language/anope.ru_RU.po
@@ -3775,7 +3775,7 @@ msgid ""
 msgstr ""
 "Синтаксис: RELOAD\n"
 "\n"
-"Заставляет сервисы перечитать конфигурационный файл services.conf.\n"
+"Заставляет сервисы перечитать конфигурационный файл anope.conf.\n"
 "Примечание: активация некоторых новых/измененных директив конфига\n"
 "требует  полного  перезапуска  сервисов  (например: изменение ников\n"
 "сервисов, активация лимитирования сессий, и т.д.)"
@@ -4881,7 +4881,7 @@ msgstr ""
 "Стоит заметить, что во избежание  флуда пользователь получит только\n"
 "%d новость(и), так что если у  вас в списке их  больше - показаны\n"
 "будут только  последние из них. Значение  NewsCount,  отвечающее за\n"
-"одновременно посылаемое кол-во новостей, указывается в services.conf\n"
+"одновременно посылаемое кол-во новостей, указывается в anope.conf\n"
 "\n"
 "Команда LOGONNEWS ADD позволяет добавить новость в список.\n"
 "\n"
@@ -4910,7 +4910,7 @@ msgstr ""
 "Стоит заметить, что во избежание  флуда пользователь получит только\n"
 "%d новость(и), так что если у  вас в списке их  больше - показаны\n"
 "будут только  последние из них. Значение  NewsCount,  отвечающее за\n"
-"одновременно посылаемое кол-во новостей, указывается в services.conf\n"
+"одновременно посылаемое кол-во новостей, указывается в anope.conf\n"
 "\n"
 "Команда OPERNEWS ADD позволяет добавить новость в список.\n"
 "\n"
diff --git a/language/anope.tr_TR.po b/language/anope.tr_TR.po
index fc8dbe1ca..2a41b4f34 100644
--- a/language/anope.tr_TR.po
+++ b/language/anope.tr_TR.po
@@ -4756,7 +4756,7 @@ msgstr ""
 "to them.  (However, no more than %d messages will be\n"
 "sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
@@ -4778,7 +4778,7 @@ msgstr ""
 "be sent to them.  (However, no more than %d messages will\n"
 "be sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
@@ -8929,7 +8929,7 @@ msgstr "%s için successor kaldırıldı."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "SuperAdmin setting not enabled in services.conf"
+msgstr "SuperAdmin setting not enabled in anope.conf"
 
 #: modules/commands/ns_suspend.cpp:60
 #, fuzzy
diff --git a/src/config.cpp b/src/config.cpp
index 2fe8dd74f..5042f1a47 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -24,7 +24,7 @@
 
 using namespace Configuration;
 
-File ServicesConf("services.conf", false); // Services configuration file name
+File ServicesConf("anope.conf", false); // Services configuration file name
 Conf *Config = NULL;
 
 Block::Block(const Anope::string &n) : name(n), linenum(-1)
diff --git a/src/init.cpp b/src/init.cpp
index 124181d2b..e64bf0eff 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -493,7 +493,7 @@ void Anope::Init(int ac, char **av)
 	catch (const ConfigException &ex)
 	{
 		Log(LOG_TERMINAL) << ex.GetReason();
-		Log(LOG_TERMINAL) << "*** Support resources: Read through the services.conf self-contained";
+		Log(LOG_TERMINAL) << "*** Support resources: Read through the anope.conf self-contained";
 		Log(LOG_TERMINAL) << "*** documentation. Read the documentation files found in the 'docs'";
 		Log(LOG_TERMINAL) << "*** folder. Visit our portal located at http://www.anope.org/. Join";
 		Log(LOG_TERMINAL) << "*** our support channel on /server irc.anope.org channel #anope.";
diff --git a/src/tools/anoperc.in b/src/tools/anoperc.in
index 5f4e6c5eb..6a7102083 100644
--- a/src/tools/anoperc.in
+++ b/src/tools/anoperc.in
@@ -14,8 +14,8 @@
 
 
 
-ANOPEPID="@INSTDIR@/data/services.pid"
-ANOPROG="@INSTDIR@/bin/services"
+ANOPEPID="@INSTDIR@/data/anope.pid"
+ANOPROG="@INSTDIR@/bin/anope"
 LOG="@INSTDIR@/data/logs/"
 ARCVERSION="2"