1 files changed, 26 insertions, 35 deletions

diff --git a/data/memoserv.example.conf b/data/memoserv.example.conf
index 9f07ec424..cda9a02ae 100644
--- a/data/memoserv.example.conf
+++ b/data/memoserv.example.conf
@@ -40,15 +40,6 @@ service
 	 * unable to do certain things if this option is enabled.
 	 */
 	#modes = "+o"
-
-	/*
-	 * An optional comma separated list of channels this service should join. Outside
-	 * of log channels this is not very useful, as the service will just idle in the
-	 * specified channels, and will not accept any types of commands.
-	 *
-	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
-	 */
-	#channels = "@#services,#mychan"
 }
 
 /*
@@ -58,7 +49,7 @@ service
  */
 module
 {
-	name = "memoserv"
+	name = "memoserv/main"
 	/*
 	 * The name of the client that should be MemoServ. Clients are configured
 	 * with the service blocks.
@@ -101,37 +92,37 @@ module
 command { service = "MemoServ"; name = "HELP"; command = "generic/help"; }
 
 /*
- * ms_cancel
+ * memoserv/cancel
  *
  * Provides the command memoserv/cancel.
  *
  * Used to cancel memos already sent but not yet read.
  */
-module { name = "ms_cancel" }
+module { name = "memoserv/cancel" }
 command { service = "MemoServ"; name = "CANCEL"; command = "memoserv/cancel"; }
 
 /*
- * ms_check
+ * memoserv/check
  *
  * Provides the command memoserv/check.
  *
  * Used to check if a sent memo has been read.
  */
-module { name = "ms_check" }
+module { name = "memoserv/check" }
 command { service = "MemoServ"; name = "CHECK"; command = "memoserv/check"; }
 
 /*
- * ms_del
+ * memoserv/del
  *
  * Provides the command memoserv/del.
  *
  * Used to delete your memos.
  */
-module { name = "ms_del" }
+module { name = "memoserv/del" }
 command { service = "MemoServ"; name = "DEL"; command = "memoserv/del"; }
 
 /*
- * ms_ignore
+ * memoserv/ignore
  *
  * Provides the command memoserv/ignore.
  *
@@ -139,7 +130,7 @@ command { service = "MemoServ"; name = "DEL"; command = "memoserv/del"; }
  */
 module
 {
-	name = "ms_ignore"
+	name = "memoserv/ignore"
 
 	/*
 	 * The maximum number of entries that may be on a memo ignore list.
@@ -151,37 +142,37 @@ module
 command { service = "MemoServ"; name = "IGNORE"; command = "memoserv/ignore"; }
 
 /*
- * ms_info
+ * memoserv/info
  *
  * Provides the command memoserv/info.
  *
  * Used to show memo related information about an account or a channel.
  */
-module { name = "ms_info" }
+module { name = "memoserv/info" }
 command { service = "MemoServ"; name = "INFO"; command = "memoserv/info"; }
 
 /*
- * ms_list
+ * memoserv/list
  *
  * Provides the command memoserv/list.
  *
  * Used to list your current memos.
  */
-module { name = "ms_list" }
+module { name = "memoserv/list" }
 command { service = "MemoServ"; name = "LIST"; command = "memoserv/list"; }
 
 /*
- * ms_read
+ * memoserv/read
  *
  * Provides the command memoserv/read.
  *
  * Used to read your memos.
  */
-module { name = "ms_read" }
+module { name = "memoserv/read" }
 command { service = "MemoServ"; name = "READ"; command = "memoserv/read"; }
 
 /*
- * ms_rsend
+ * memoserv/rsend
  *
  * Provides the command memoserv/rsend.
  *
@@ -191,10 +182,10 @@ command { service = "MemoServ"; name = "READ"; command = "memoserv/read"; }
  */
 #module
 {
-	name = "ms_rsend"
+	name = "memoserv/rsend"
 
 	/*
-	 * Only allow Services Operators to use ms_rsend.
+	 * Only allow Services Operators to use memoserv/rsend.
 	 *
 	 * This directive is optional.
 	 */
@@ -203,41 +194,41 @@ command { service = "MemoServ"; name = "READ"; command = "memoserv/read"; }
 #command { service = "MemoServ"; name = "RSEND"; command = "memoserv/rsend"; }
 
 /*
- * ms_send
+ * memoserv/send
  *
  * Provides the command memoserv/send.
  *
  * Used to send memos.
  */
-module { name = "ms_send" }
+module { name = "memoserv/send" }
 command { service = "MemoServ"; name = "SEND"; command = "memoserv/send"; }
 
 /*
- * ms_sendall
+ * memoserv/sendall
  *
  * Provides the command memoserv/sendall.
  *
  * Used to send a mass memo to every registered user.
  */
-module { name = "ms_sendall" }
+module { name = "memoserv/sendall" }
 command { service = "MemoServ"; name = "SENDALL"; command = "memoserv/sendall"; permission = "memoserv/sendall"; }
 
 /*
- * ms_set
+ * memoserv/set
  *
  * Provides the command memoserv/set.
  *
  * Used to set settings such as how you are notified of new memos, and your memo limit.
  */
-module { name = "ms_set" }
+module { name = "memoserv/set" }
 command { service = "MemoServ"; name = "SET"; command = "memoserv/set"; }
 
 /*
- * ms_staff
+ * memoserv/staff
  *
  * Provides the command memoserv/staff.
  *
  * Used to send a memo to all registered staff members.
  */
-module { name = "ms_staff" }
+module { name = "memoserv/staff" }
 command { service = "MemoServ"; name = "STAFF"; command = "memoserv/staff"; permission = "memoserv/staff"; }