diff --git a/src/api-moddata.c b/src/api-moddata.c
index 3e235fe91..464e9f3ad 100644
--- a/src/api-moddata.c
+++ b/src/api-moddata.c
@@ -387,5 +387,5 @@ int moddata_globalvar_set(char *varname, char *value)
 }
 
 /* The rest of the MD related functions, the send/receive functions,
- * are in src/modules/m_md.c
+ * are in src/modules/md.c
  */
diff --git a/src/conf.c b/src/conf.c
index 97f9fa324..60f1ad8a8 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -3538,7 +3538,7 @@ int	_test_files(ConfigFile *conf, ConfigEntry *ce)
 			has_opermotd = 1;
 		}
 		/* files::svsmotd
-		 * This config stuff should somehow be inside of modules/m_svsmotd.c!!!... right?
+		 * This config stuff should somehow be inside of modules/svsmotd.c!!!... right?
 		 */
 		else if (!strcmp(cep->ce_varname, "svsmotd"))
 		{
diff --git a/src/modules/away.c b/src/modules/away.c
index 16ba7bd1c..a07348295 100644
--- a/src/modules/away.c
+++ b/src/modules/away.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_away.c
+ *   IRC - Internet Relay Chat, src/modules/away.c
  *   (C) 2001 The UnrealIRCd Team
  *
  *   away command
diff --git a/src/modules/botmotd.c b/src/modules/botmotd.c
index 7ae1d9d95..7299e316d 100644
--- a/src/modules/botmotd.c
+++ b/src/modules/botmotd.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_botmotd.c
+ *   IRC - Internet Relay Chat, src/modules/botmotd.c
  *   (C) 2005 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/cap.c b/src/modules/cap.c
index bfcb08b47..67d6d8c38 100644
--- a/src/modules/cap.c
+++ b/src/modules/cap.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_cap.c
+ *   IRC - Internet Relay Chat, src/modules/cap.c
  *   (C) 2012 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/chghost.c b/src/modules/chghost.c
index 95fe6c1c5..f3f85d51c 100644
--- a/src/modules/chghost.c
+++ b/src/modules/chghost.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_chghost.c
+ *   IRC - Internet Relay Chat, src/modules/chghost.c
  *   (C) 1999-2001 Carsten Munk (Techie/Stskeeps) <stskeeps@tspre.org>
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/chgident.c b/src/modules/chgident.c
index 2a70ec46e..3752c57a3 100644
--- a/src/modules/chgident.c
+++ b/src/modules/chgident.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_chgident.c
+ *   IRC - Internet Relay Chat, src/modules/chgident.c
  *   (C) 1999-2001 Carsten Munk (Techie/Stskeeps) <stskeeps@tspre.org>
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/chgname.c b/src/modules/chgname.c
index b4be88615..ab66a7256 100644
--- a/src/modules/chgname.c
+++ b/src/modules/chgname.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_chgname.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/chgname.c
  *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
  *   Moved to modules by Fish (Justin Hammond)
  *
diff --git a/src/modules/cycle.c b/src/modules/cycle.c
index 6221cfd70..19045f73b 100644
--- a/src/modules/cycle.c
+++ b/src/modules/cycle.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_cycle.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/cycle.c
  *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/modules/invite.c b/src/modules/invite.c
index a9c6630e2..8e38ce6ac 100644
--- a/src/modules/invite.c
+++ b/src/modules/invite.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_invite.c
+ *   IRC - Internet Relay Chat, src/modules/invite.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/ircops.c b/src/modules/ircops.c
index 369487b16..3a1f777bb 100644
--- a/src/modules/ircops.c
+++ b/src/modules/ircops.c
@@ -77,7 +77,7 @@ MOD_UNLOAD()
  */
 
 /************************************************************************
- * IRC - Internet Relay Chat, modules/m_ircops.c
+ * IRC - Internet Relay Chat, modules/ircops.c
  *
  *   Copyright (C) 2000-2002 TR-IRCD Development
  *
diff --git a/src/modules/ison.c b/src/modules/ison.c
index 45b7966f7..cf76abf74 100644
--- a/src/modules/ison.c
+++ b/src/modules/ison.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_ison.c
+ *   IRC - Internet Relay Chat, src/modules/ison.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/join.c b/src/modules/join.c
index 772740431..81a3c5ebe 100644
--- a/src/modules/join.c
+++ b/src/modules/join.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_join.c
+ *   IRC - Internet Relay Chat, src/modules/join.c
  *   (C) 2005 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/kick.c b/src/modules/kick.c
index 7a7e869c7..9c42e3808 100644
--- a/src/modules/kick.c
+++ b/src/modules/kick.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_kick.c
+ *   IRC - Internet Relay Chat, src/modules/kick.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/kill.c b/src/modules/kill.c
index 5fe9bf2d8..3d735c3f6 100644
--- a/src/modules/kill.c
+++ b/src/modules/kill.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_kill.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/kill.c
  *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
  *   Moved to modules by Fish (Justin Hammond)
  *
diff --git a/src/modules/knock.c b/src/modules/knock.c
index 04510d87f..04040d89d 100644
--- a/src/modules/knock.c
+++ b/src/modules/knock.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_knock.c
+ *   IRC - Internet Relay Chat, src/modules/knock.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/lag.c b/src/modules/lag.c
index 1f93f63e8..253af5336 100644
--- a/src/modules/lag.c
+++ b/src/modules/lag.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_lag.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/lag.c
  *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
  *   Moved to modules by Fish (Justin Hammond)
  *
diff --git a/src/modules/list.c b/src/modules/list.c
index 871c91c9c..43f2f042a 100644
--- a/src/modules/list.c
+++ b/src/modules/list.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_list.c
+ *   IRC - Internet Relay Chat, src/modules/list.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/lusers.c b/src/modules/lusers.c
index d64e4da74..d828792e7 100644
--- a/src/modules/lusers.c
+++ b/src/modules/lusers.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_lusers.c
+ *   IRC - Internet Relay Chat, src/modules/lusers.c
  *   (C) 2005 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/mkpasswd.c b/src/modules/mkpasswd.c
index fa23b52a2..8982e5852 100644
--- a/src/modules/mkpasswd.c
+++ b/src/modules/mkpasswd.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_mkpasswd.c
+ *   IRC - Internet Relay Chat, src/modules/mkpasswd.c
  *   (C) 2001 The UnrealIRCd Team
  *
  *   mkpasswd command
diff --git a/src/modules/mode.c b/src/modules/mode.c
index eb56e743a..d4ba582bc 100644
--- a/src/modules/mode.c
+++ b/src/modules/mode.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_mode.c
+ *   IRC - Internet Relay Chat, src/modules/mode.c
  *   (C) 2005 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/motd.c b/src/modules/motd.c
index 486331ce2..3e3f844d9 100644
--- a/src/modules/motd.c
+++ b/src/modules/motd.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_motd.c
+ *   IRC - Internet Relay Chat, src/modules/motd.c
  *   (C) 2005 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/names.c b/src/modules/names.c
index be1937a9f..f19cd480f 100644
--- a/src/modules/names.c
+++ b/src/modules/names.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_names.c
+ *   IRC - Internet Relay Chat, src/modules/names.c
  *   (C) 2006 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/nick.c b/src/modules/nick.c
index 97127d4f2..28c7061b7 100644
--- a/src/modules/nick.c
+++ b/src/modules/nick.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_nick.c
+ *   IRC - Internet Relay Chat, src/modules/nick.c
  *   (C) 1999-2005 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/oper.c b/src/modules/oper.c
index 9ab7de99d..023deb218 100644
--- a/src/modules/oper.c
+++ b/src/modules/oper.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_oper.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/oper.c
  *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
  *   Moved to modules by Fish (Justin Hammond)
  *
diff --git a/src/modules/opermotd.c b/src/modules/opermotd.c
index 57af5337a..a6c7a2aac 100644
--- a/src/modules/opermotd.c
+++ b/src/modules/opermotd.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_opermotd.c
+ *   IRC - Internet Relay Chat, src/modules/opermotd.c
  *   (C) 2005 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/part.c b/src/modules/part.c
index 10867374c..c3fca3af3 100644
--- a/src/modules/part.c
+++ b/src/modules/part.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_part.c
+ *   IRC - Internet Relay Chat, src/modules/part.c
  *   (C) 2005 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/pass.c b/src/modules/pass.c
index ebe3756fe..9d050c874 100644
--- a/src/modules/pass.c
+++ b/src/modules/pass.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_pass.c
+ *   IRC - Internet Relay Chat, src/modules/pass.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/pingpong.c b/src/modules/pingpong.c
index 3cb3c4967..5b1005d97 100644
--- a/src/modules/pingpong.c
+++ b/src/modules/pingpong.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_pingpong.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/pingpong.c
  *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
  *   Moved to modules by Fish (Justin Hammond)
  *
diff --git a/src/modules/protoctl.c b/src/modules/protoctl.c
index 33525cae0..eab5e8df8 100644
--- a/src/modules/protoctl.c
+++ b/src/modules/protoctl.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_protoctl.c
+ *   IRC - Internet Relay Chat, src/modules/protoctl.c
  *   (C) 2004- The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/quit.c b/src/modules/quit.c
index 993b4fac2..80d7d96a4 100644
--- a/src/modules/quit.c
+++ b/src/modules/quit.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_quit.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/quit.c
  *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
  *   Moved to modules by Fish (Justin Hammond)
  *
diff --git a/src/modules/sajoin.c b/src/modules/sajoin.c
index 163dc8193..baf3e4c12 100644
--- a/src/modules/sajoin.c
+++ b/src/modules/sajoin.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_sajoin.c
+ *   IRC - Internet Relay Chat, src/modules/sajoin.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/samode.c b/src/modules/samode.c
index a4a504385..d7917aa23 100644
--- a/src/modules/samode.c
+++ b/src/modules/samode.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_samode.c
+ *   IRC - Internet Relay Chat, src/modules/samode.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/sapart.c b/src/modules/sapart.c
index 9819b0e0b..2e29ad8ea 100644
--- a/src/modules/sapart.c
+++ b/src/modules/sapart.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_sapart.c
+ *   IRC - Internet Relay Chat, src/modules/sapart.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/sasl.c b/src/modules/sasl.c
index 794bd877e..89dd5f8c3 100644
--- a/src/modules/sasl.c
+++ b/src/modules/sasl.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_sasl.c
+ *   IRC - Internet Relay Chat, src/modules/sasl.c
  *   (C) 2012 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/sdesc.c b/src/modules/sdesc.c
index 6f43e2d84..0eaf1d566 100644
--- a/src/modules/sdesc.c
+++ b/src/modules/sdesc.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_sdesc.c
+ *   IRC - Internet Relay Chat, src/modules/sdesc.c
  *   (C) 1999-2001 Carsten Munk (Techie/Stskeeps) <stskeeps@tspre.org>
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/sendsno.c b/src/modules/sendsno.c
index fe47896c7..6c403c216 100644
--- a/src/modules/sendsno.c
+++ b/src/modules/sendsno.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_sendsno.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/sendsno.c
  *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
  *   Moved to modules by Fish (Justin Hammond)
  *
diff --git a/src/modules/sendumode.c b/src/modules/sendumode.c
index eb847b435..a6d8258c1 100644
--- a/src/modules/sendumode.c
+++ b/src/modules/sendumode.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_sendumode.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/sendumode.c
  *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
  *   Moved to modules by Fish (Justin Hammond)
  *
diff --git a/src/modules/server.c b/src/modules/server.c
index e3e38bb16..d23e01a7f 100644
--- a/src/modules/server.c
+++ b/src/modules/server.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_server.c
+ *   IRC - Internet Relay Chat, src/modules/server.c
  *   (C) 2004-present The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/sethost.c b/src/modules/sethost.c
index 79ff20801..3b7e97876 100644
--- a/src/modules/sethost.c
+++ b/src/modules/sethost.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_sethost.c
+ *   IRC - Internet Relay Chat, src/modules/sethost.c
  *   (C) 1999-2001 Carsten Munk (Techie/Stskeeps) <stskeeps@tspre.org>
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/setident.c b/src/modules/setident.c
index 5199b29f6..55b826914 100644
--- a/src/modules/setident.c
+++ b/src/modules/setident.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_setident.c
+ *   IRC - Internet Relay Chat, src/modules/setident.c
  *   (C) 1999-2001 Carsten Munk (Techie/Stskeeps) <stskeeps@tspre.org>
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/setname.c b/src/modules/setname.c
index 0b2d32343..8f059c3fa 100644
--- a/src/modules/setname.c
+++ b/src/modules/setname.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_setname.c
+ *   IRC - Internet Relay Chat, src/modules/setname.c
  *   (c) 1999-2001 Dominick Meglio (codemastr) <codemastr@unrealircd.com>
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/silence.c b/src/modules/silence.c
index bd5039f13..23532b86e 100644
--- a/src/modules/silence.c
+++ b/src/modules/silence.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_silence.c
+ *   IRC - Internet Relay Chat, src/modules/silence.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/sjoin.c b/src/modules/sjoin.c
index 14bf3b278..0fbaa3b83 100644
--- a/src/modules/sjoin.c
+++ b/src/modules/sjoin.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_sjoin.c
+ *   IRC - Internet Relay Chat, src/modules/sjoin.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/sqline.c b/src/modules/sqline.c
index 6933e2e93..5ba3e51ee 100644
--- a/src/modules/sqline.c
+++ b/src/modules/sqline.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_sqline.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/sqline.c
  *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
  *   Moved to modules by Fish (Justin Hammond)
  *
diff --git a/src/modules/squit.c b/src/modules/squit.c
index 8c6f32e66..320ee622d 100644
--- a/src/modules/squit.c
+++ b/src/modules/squit.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_squit.c
+ *   IRC - Internet Relay Chat, src/modules/squit.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/starttls.c b/src/modules/starttls.c
index 15d60d752..e67408b31 100644
--- a/src/modules/starttls.c
+++ b/src/modules/starttls.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_starttls.c
+ *   IRC - Internet Relay Chat, src/modules/starttls.c
  *   (C) 2009 Syzop & The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/stats.c b/src/modules/stats.c
index 31e36bf79..1e2f48d40 100644
--- a/src/modules/stats.c
+++ b/src/modules/stats.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_stats.c
+ *   IRC - Internet Relay Chat, src/modules/stats.c
  *   (C) 2004-present The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/svsfline.c b/src/modules/svsfline.c
index 914a06e74..4e8c46dcc 100644
--- a/src/modules/svsfline.c
+++ b/src/modules/svsfline.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_svsfline.c
+ *   IRC - Internet Relay Chat, src/modules/svsfline.c
  *   (C) 2004-present The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/svsjoin.c b/src/modules/svsjoin.c
index 337820801..541c1d0d2 100644
--- a/src/modules/svsjoin.c
+++ b/src/modules/svsjoin.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_svsjoin.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/svsjoin.c
  *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/modules/svskill.c b/src/modules/svskill.c
index 1b2c48ece..0f83109e8 100644
--- a/src/modules/svskill.c
+++ b/src/modules/svskill.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_svskill.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/svskill.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/modules/svslusers.c b/src/modules/svslusers.c
index 8586a2e8b..e4ef482ea 100644
--- a/src/modules/svslusers.c
+++ b/src/modules/svslusers.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_svslusers.c
+ *   IRC - Internet Relay Chat, src/modules/svslusers.c
  *   (C) 2002 codemastr [Dominick Meglio] (codemastr@unrealircd.com)
  *
  *   SVSLUSERS command, allows remote setting of local and global max user count
diff --git a/src/modules/svsmode.c b/src/modules/svsmode.c
index b11e1fb05..a915e6aba 100644
--- a/src/modules/svsmode.c
+++ b/src/modules/svsmode.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_svsmode.c
+ *   IRC - Internet Relay Chat, src/modules/svsmode.c
  *   (C) 2001 The UnrealIRCd Team
  *
  *   SVSMODE and SVS2MODE commands
diff --git a/src/modules/svsmotd.c b/src/modules/svsmotd.c
index f4131a5d5..cdad541a9 100644
--- a/src/modules/svsmotd.c
+++ b/src/modules/svsmotd.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_svsmotd.c
+ *   IRC - Internet Relay Chat, src/modules/svsmotd.c
  *   (C) 2001 The UnrealIRCd Team
  *
  *   SVSMOTD command
diff --git a/src/modules/svsnick.c b/src/modules/svsnick.c
index c86b63817..246b9d150 100644
--- a/src/modules/svsnick.c
+++ b/src/modules/svsnick.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_svsnick.c
+ *   IRC - Internet Relay Chat, src/modules/svsnick.c
  *   (C) 2001 The UnrealIRCd Team
  *
  *   svsnick command
diff --git a/src/modules/svsnline.c b/src/modules/svsnline.c
index 281a53887..685e77027 100644
--- a/src/modules/svsnline.c
+++ b/src/modules/svsnline.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_svsnline.c
+ *   IRC - Internet Relay Chat, src/modules/svsnline.c
  *   (C) 2001 The UnrealIRCd Team
  *
  *   SVSNLINE Command
diff --git a/src/modules/svsnolag.c b/src/modules/svsnolag.c
index 401681023..d91b7dc73 100644
--- a/src/modules/svsnolag.c
+++ b/src/modules/svsnolag.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_svsnolag.c
+ *   IRC - Internet Relay Chat, src/modules/svsnolag.c
  *   (C) 2006 Alex Berezhnyak and djGrrr
  *
  *   Fake lag exception - SVSNOLAG and SVS2NOLAG commands
diff --git a/src/modules/svsnoop.c b/src/modules/svsnoop.c
index 46bf0bd8f..ea2f7d2e7 100644
--- a/src/modules/svsnoop.c
+++ b/src/modules/svsnoop.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_svsnoop.c
+ *   IRC - Internet Relay Chat, src/modules/svsnoop.c
  *   (C) 2001 The UnrealIRCd Team
  *
  *   svsnoop command
diff --git a/src/modules/svspart.c b/src/modules/svspart.c
index f2e2d90ac..901701e22 100644
--- a/src/modules/svspart.c
+++ b/src/modules/svspart.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_svspart.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/svspart.c
  *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/modules/svssilence.c b/src/modules/svssilence.c
index b341c87f2..2e127fb84 100644
--- a/src/modules/svssilence.c
+++ b/src/modules/svssilence.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_svssilence.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/svssilence.c
  *   (C) 2003 Bram Matthys (Syzop) and the UnrealIRCd Team
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/modules/svssno.c b/src/modules/svssno.c
index 17cf58e22..da80f48fb 100644
--- a/src/modules/svssno.c
+++ b/src/modules/svssno.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_svssno.c
+ *   IRC - Internet Relay Chat, src/modules/svssno.c
  *   (C) 2004 Dominick Meglio (codemastr) and the UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/svswatch.c b/src/modules/svswatch.c
index 1c2e0dbb0..35df6ad55 100644
--- a/src/modules/svswatch.c
+++ b/src/modules/svswatch.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_svswatch.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/svswatch.c
  *   (C) 2003 Bram Matthys (Syzop) and the UnrealIRCd Team
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/modules/swhois.c b/src/modules/swhois.c
index 32084637e..8674e34fd 100644
--- a/src/modules/swhois.c
+++ b/src/modules/swhois.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_swhois.c
+ *   IRC - Internet Relay Chat, src/modules/swhois.c
  *   (C) 2001 The UnrealIRCd Team
  *
  *   SWHOIS command
diff --git a/src/modules/time.c b/src/modules/time.c
index dcfbcb521..08c4f00c0 100644
--- a/src/modules/time.c
+++ b/src/modules/time.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_time.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/time.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/modules/topic.c b/src/modules/topic.c
index 2d0803f30..8a83a6e45 100644
--- a/src/modules/topic.c
+++ b/src/modules/topic.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_topic.c
+ *   IRC - Internet Relay Chat, src/modules/topic.c
  *   (C) 2004-present The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/trace.c b/src/modules/trace.c
index 1ca643dec..a3879cde8 100644
--- a/src/modules/trace.c
+++ b/src/modules/trace.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_trace.c
+ *   IRC - Internet Relay Chat, src/modules/trace.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/tsctl.c b/src/modules/tsctl.c
index dd87b8d2d..ac8d42dfe 100644
--- a/src/modules/tsctl.c
+++ b/src/modules/tsctl.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_tsctl.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/tsctl.c
  *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
  *   Moved to modules by Fish (Justin Hammond)
  *
diff --git a/src/modules/umode2.c b/src/modules/umode2.c
index e28a793ef..78b0f4afe 100644
--- a/src/modules/umode2.c
+++ b/src/modules/umode2.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_umode2.c
+ *   IRC - Internet Relay Chat, src/modules/umode2.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/undccdeny.c b/src/modules/undccdeny.c
index f26320029..c4800362a 100644
--- a/src/modules/undccdeny.c
+++ b/src/modules/undccdeny.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_undccdeny.c
+ *   IRC - Internet Relay Chat, src/modules/undccdeny.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/unsqline.c b/src/modules/unsqline.c
index 2a86b2b80..faf42067d 100644
--- a/src/modules/unsqline.c
+++ b/src/modules/unsqline.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_unsqline.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/unsqline.c
  *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
  *   Moved to modules by Fish (Justin Hammond)
  *
diff --git a/src/modules/user.c b/src/modules/user.c
index 325d6ca1d..e4508123b 100644
--- a/src/modules/user.c
+++ b/src/modules/user.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_user.c
+ *   IRC - Internet Relay Chat, src/modules/user.c
  *   (C) 2005 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/userhost.c b/src/modules/userhost.c
index 9ab108b20..09d08aa85 100644
--- a/src/modules/userhost.c
+++ b/src/modules/userhost.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_userhost.c
+ *   IRC - Internet Relay Chat, src/modules/userhost.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/userip.c b/src/modules/userip.c
index b5e0123a8..d4718c73c 100644
--- a/src/modules/userip.c
+++ b/src/modules/userip.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_userip.c
+ *   IRC - Internet Relay Chat, src/modules/userip.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/vhost.c b/src/modules/vhost.c
index 8abdb2e80..425b4cdb2 100644
--- a/src/modules/vhost.c
+++ b/src/modules/vhost.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_vhost.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/vhost.c
  *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/modules/wallops.c b/src/modules/wallops.c
index b073d46e5..4ac07592b 100644
--- a/src/modules/wallops.c
+++ b/src/modules/wallops.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_wallops.c
+ *   IRC - Internet Relay Chat, src/modules/wallops.c
  *   (C) 2004 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/watch.c b/src/modules/watch.c
index f784f874c..cfe9fd08f 100644
--- a/src/modules/watch.c
+++ b/src/modules/watch.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/m_watch.c
+ *   IRC - Internet Relay Chat, src/modules/watch.c
  *   (C) 2005 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/whois.c b/src/modules/whois.c
index eb3426137..6a1868c52 100644
--- a/src/modules/whois.c
+++ b/src/modules/whois.c
@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_whois.c
+ *   Unreal Internet Relay Chat Daemon, src/modules/whois.c
  *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
  *   Moved to modules by Fish (Justin Hammond)
  *