diff --git a/doc/RELEASE-NOTES b/doc/RELEASE-NOTES
index 03039323e..c7b798249 100644
--- a/doc/RELEASE-NOTES
+++ b/doc/RELEASE-NOTES
@@ -85,7 +85,7 @@ listed on: https://www.unrealircd.org/docs/Upgrading_from_3.2.x
   B) easier for coders to see all source code related to a specific feature
   C) possible to fix bugs and just reload rather than restart the IRCd.
 
-  Have a look at modules.full.conf which contains the "default" set of
+  Have a look at modules.default.conf which contains the "default" set of
   modules that you can load if you just want to load all functionality.
   If you want to customize the list of modules to load then simply make
   a copy of that file, give it a different name, and include that one
@@ -172,8 +172,11 @@ listed on: https://www.unrealircd.org/docs/Upgrading_from_3.2.x
   titled 'CONFIGURATION CHANGES' about 100 lines up. (A4)
 * badword quit { } is removed, we use badword channel for it. (A4)
 * badwords.*.conf is now just one badwords.conf
-* To load the default modules you can now include modules.full.conf.
-  This file was called modules.conf in earlier alpha's. (A4)
+* To load all default modules you now include modules.default.conf.
+  This file was called modules.conf in earlier alpha's.
+  The file has been split up in sections and a lot of comments have
+  been added to aid the user in deciding whether to load or not to
+  load each module. (A4)
 * Snomask +s is now (always) IRCOp-only. (A4)
 * There's now actually an idea behind HalfOp permissions. The idea
   is that halfops should be able to help out in case of a flood but
diff --git a/doc/conf/examples/example.conf b/doc/conf/examples/example.conf
index b776b68c8..974f5a865 100644
--- a/doc/conf/examples/example.conf
+++ b/doc/conf/examples/example.conf
@@ -22,22 +22,22 @@
 # This is also a comment, again this line is ignored (comment type #3)
 
 /* UnrealIRCd makes heavy use of modules. By using this include we
- * tell the ircd to read the file 'modules.full.conf' which contains
- * more than a hundred loadmodule lines that load all the necessary
- * modules.
+ * tell the ircd to read the file 'modules.default.conf' which contains
+ * more than 150 loadmodule lines that load all the necessary modules.
  */
-include "modules.full.conf";
+include "modules.default.conf";
 
 /* Now let's include some other files as well:
  * - help.conf for our on-IRC /HELPOP system
- * - badwords.*.conf for channel and user mode +G
+ * - badwords.conf for channel and user mode +G
  * - spamfilter.conf as an example for spamfilter usage
+ * - operclass.default.conf contains some good operclasses which
+ *   you can use in your oper blocks.
  */
 include "help.conf";
-include "badwords.channel.conf";
-include "badwords.message.conf";
-include "badwords.quit.conf";
+include "badwords.conf";
 include "spamfilter.conf";
+include "operclass.default.conf";
 
 /* This is the me { } block which basically says who we are.
  * It defines our server name, some information line and an unique "sid".
diff --git a/doc/conf/examples/example.fr.conf b/doc/conf/examples/example.fr.conf
index 0f190b46b..5969dc8ca 100644
--- a/doc/conf/examples/example.fr.conf
+++ b/doc/conf/examples/example.fr.conf
@@ -33,9 +33,9 @@
 
 /*
  * UnrealIRCd supporte des modules et certains sont obligatoires.
- * La ligne suivante charge tous les modules définis dans modules.full.conf
+ * La ligne suivante charge tous les modules définis dans modules.default.conf
  */
-include "modules.full.conf";
+include "modules.default.conf";
 
 /*
  * Vous pouvez également inclure d'autres fichiers de configuration.
@@ -46,10 +46,9 @@ include "modules.full.conf";
  * Vous voudrez probablement les inclure:
  */
 include "doc/help.fr.conf";
-include "badwords.channel.conf";
-include "badwords.message.conf";
-include "badwords.quit.conf";
+include "badwords.conf";
 include "spamfilter.conf";
+include "operclass.default.conf";
 
 /*
  * ACTUEL : me {}
diff --git a/doc/conf/modules.full.conf b/doc/conf/modules.default.conf
similarity index 99%
rename from doc/conf/modules.full.conf
rename to doc/conf/modules.default.conf
index 92ad11e5f..1cc9a34b6 100644
--- a/doc/conf/modules.full.conf
+++ b/doc/conf/modules.default.conf
@@ -3,7 +3,7 @@
  *
  * If you want to have all UnrealIRCd functionality, then include this
  * file from your unrealircd.conf by using:
- * include "modules.full.conf";
+ * include "modules.default.conf";
  *
  * DO NOT EDIT THIS FILE! IT WILL BE OVERWRITTEN DURING NEXT UPGRADE!!
  * If you want to customize the modules to load, make a copy of this
diff --git a/src/modules.c b/src/modules.c
index 0c2f87f28..ae455c7d3 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -1616,7 +1616,7 @@ int i, n, errors=0;
 			if (n < 1)
 			{
 				config_error("ERROR: efunction '%s' not found, you probably did not "
-				             "load all required modules! (hint: see modules.full.conf)",
+				             "load all required modules! (hint: see modules.default.conf)",
 				             efunction_table[i].name);
 				errors++;
 			} else
diff --git a/src/s_conf.c b/src/s_conf.c
index 9289fb8d5..25d2392d3 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -8214,7 +8214,7 @@ int	_conf_loadmodule(ConfigFile *conf, ConfigEntry *ce)
 	{
 		config_error("%s:%i: You are trying to load the 'commands' module, this is no longer supported. "
 		             "Fix this by editing your configuration file: remove the loadmodule line for commands and add the following line instead: "
-		             "include \"modules.full.conf\";",
+		             "include \"modules.default.conf\";",
 		             ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
 		need_34_upgrade = 1;
 		return -1;
diff --git a/src/updconf.c b/src/updconf.c
index d16802684..b05ee0bcc 100644
--- a/src/updconf.c
+++ b/src/updconf.c
@@ -498,16 +498,16 @@ int upgrade_loadmodule(ConfigEntry *ce)
 	
 	if (our_strcasestr(file, "commands.dll") || our_strcasestr(file, "/commands.so"))
 	{
-		snprintf(buf, sizeof(buf), "include \"modules.full.conf\";\n");
+		snprintf(buf, sizeof(buf), "include \"modules.default.conf\";\n");
 		replace_section(ce, buf);
-		config_status("- loadmodule for '%s' replaced with an include \"modules.full.conf\"", file);
+		config_status("- loadmodule for '%s' replaced with an include \"modules.default.conf\"", file);
 		return 1;
 	}
 	
 	if (our_strcasestr(file, "cloak.dll") || our_strcasestr(file, "/cloak.so"))
 	{
-		replace_section(ce, "/* NOTE: cloaking module is included in modules.full.conf */");
-		config_status("- loadmodule for '%s' removed as this is now in modules.full.conf", file);
+		replace_section(ce, "/* NOTE: cloaking module is included in modules.default.conf */");
+		config_status("- loadmodule for '%s' removed as this is now in modules.default.conf", file);
 		return 1;
 	}