14 files changed, 7 insertions, 7 deletions
diff --git a/data/botserv.example.conf b/data/botserv.example.conf
index c896aff0b..076c2a22e 100644
--- a/data/botserv.example.conf
+++ b/data/botserv.example.conf
@@ -53,7 +53,7 @@ service
  *
  * Provides essential functionality for BotServ.
  */
-module { name = "bs_main" }
+module { name = "botserv" }
 
 /*
  * Configuration for BotServ provided by bs_main.
diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf
index 418f3ae86..391941522 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -53,7 +53,7 @@ service
  *
  * Provides essential functionality for ChanServ.
  */
-module { name = "cs_main" }
+module { name = "chanserv" }
 
 /*
  * Configuration for ChanServ provided by cs_main.
diff --git a/data/global.example.conf b/data/global.example.conf
index fb10dd47c..b23365359 100644
--- a/data/global.example.conf
+++ b/data/global.example.conf
@@ -53,7 +53,7 @@ service
  *
  * Provides essential functionality for Global.
  */
-module { name = "gl_main" }
+module { name = "global" }
 
 /*
  * Configuration for Global provided by gl_main.
diff --git a/data/hostserv.example.conf b/data/hostserv.example.conf
index 2edc68e1c..575c6a416 100644
--- a/data/hostserv.example.conf
+++ b/data/hostserv.example.conf
@@ -53,7 +53,7 @@ service
  *
  * Provides essential functionality for HostServ.
  */
-module { name = "hs_main" }
+module { name = "hostserv" }
 
 /*
  * Configuration for HostServ provided by hs_main.
diff --git a/data/memoserv.example.conf b/data/memoserv.example.conf
index a0b16271a..da4156d31 100644
--- a/data/memoserv.example.conf
+++ b/data/memoserv.example.conf
@@ -53,7 +53,7 @@ service
  *
  * Provides essential functionality for MemoServ.
  */
-module { name = "ms_main" }
+module { name = "memoserv" }
 
 /*
  * Configuration for MemoServ provided by ms_main.
diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf
index dfa3bf542..5c60c60d8 100644
--- a/data/nickserv.example.conf
+++ b/data/nickserv.example.conf
@@ -53,7 +53,7 @@ service
  *
  * Provides essential functionality for NickServ.
  */
-module { name = "ns_main" }
+module { name = "nickserv" }
 
 /*
  * Configuration for NickServ provided by ns_main.
diff --git a/data/operserv.example.conf b/data/operserv.example.conf
index ad239dd3e..69467516c 100644
--- a/data/operserv.example.conf
+++ b/data/operserv.example.conf
@@ -53,7 +53,7 @@ service
  *
  * Provides essential functionality for OperServ.
  */
-module { name = "os_main" }
+module { name = "operserv" }
 
 /*
  * Configuration for OperServ provided by os_main.
diff --git a/modules/pseudoclients/bs_main.cpp b/modules/pseudoclients/botserv.cpp
index a286c54e7..a286c54e7 100644
--- a/modules/pseudoclients/bs_main.cpp
+++ b/modules/pseudoclients/botserv.cpp
diff --git a/modules/pseudoclients/cs_main.cpp b/modules/pseudoclients/chanserv.cpp
index 5c490e4ff..5c490e4ff 100644
--- a/modules/pseudoclients/cs_main.cpp
+++ b/modules/pseudoclients/chanserv.cpp
diff --git a/modules/pseudoclients/gl_main.cpp b/modules/pseudoclients/global.cpp
index c7ccf9209..c7ccf9209 100644
--- a/modules/pseudoclients/gl_main.cpp
+++ b/modules/pseudoclients/global.cpp
diff --git a/modules/pseudoclients/hs_main.cpp b/modules/pseudoclients/hostserv.cpp
index a6cc6bbb7..a6cc6bbb7 100644
--- a/modules/pseudoclients/hs_main.cpp
+++ b/modules/pseudoclients/hostserv.cpp
diff --git a/modules/pseudoclients/ms_main.cpp b/modules/pseudoclients/memoserv.cpp
index eb8af114f..eb8af114f 100644
--- a/modules/pseudoclients/ms_main.cpp
+++ b/modules/pseudoclients/memoserv.cpp
diff --git a/modules/pseudoclients/ns_main.cpp b/modules/pseudoclients/nickserv.cpp
index c31590881..c31590881 100644
--- a/modules/pseudoclients/ns_main.cpp
+++ b/modules/pseudoclients/nickserv.cpp
diff --git a/modules/pseudoclients/os_main.cpp b/modules/pseudoclients/operserv.cpp
index 9bc830335..9bc830335 100644
--- a/modules/pseudoclients/os_main.cpp
+++ b/modules/pseudoclients/operserv.cpp