diff --git a/Makefile.windows b/Makefile.windows
index bf4145a31..7236e4b5f 100644
--- a/Makefile.windows
+++ b/Makefile.windows
@@ -306,7 +306,7 @@ DLL_FILES=\
  src/modules/netinfo.dll \
  src/modules/nick.dll \
  src/modules/nocodes.dll \
- src/modules/oldcloak.dll \
+ src/modules/cloak_md5.dll \
  src/modules/oper.dll \
  src/modules/opermotd.dll \
  src/modules/part.dll \
@@ -971,8 +971,8 @@ src/modules/nick.dll: src/modules/nick.c $(INCLUDES)
 src/modules/nocodes.dll: src/modules/nocodes.c $(INCLUDES)
 	$(CC) $(MODCFLAGS) src/modules/nocodes.c /Fesrc/modules/ /Fosrc/modules/ /Fdsrc/modules/nocodes.pdb $(MODLFLAGS)
 
-src/modules/oldcloak.dll: src/modules/oldcloak.c $(INCLUDES)
-	$(CC) $(MODCFLAGS) src/modules/oldcloak.c /Fesrc/modules/ /Fosrc/modules/ /Fdsrc/modules/oldcloak.pdb $(MODLFLAGS)
+src/modules/cloak_md5.dll: src/modules/cloak_md5.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/cloak_md5.c /Fesrc/modules/ /Fosrc/modules/ /Fdsrc/modules/cloak_md5.pdb $(MODLFLAGS)
 
 src/modules/oper.dll: src/modules/oper.c $(INCLUDES)
 	$(CC) $(MODCFLAGS) src/modules/oper.c /Fesrc/modules/ /Fosrc/modules/ /Fdsrc/modules/oper.pdb $(MODLFLAGS)
diff --git a/doc/conf/modules.default.conf b/doc/conf/modules.default.conf
index ca5c711d9..77b647db2 100644
--- a/doc/conf/modules.default.conf
+++ b/doc/conf/modules.default.conf
@@ -21,7 +21,7 @@
  */
 
 /*** Cloaking (for user mode +x) ***/
-loadmodule "oldcloak";
+loadmodule "cloak_md5";
 
 
 /*** Commands ***/
diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
index 1f868a850..8e541d11b 100644
--- a/src/modules/Makefile.in
+++ b/src/modules/Makefile.in
@@ -35,7 +35,7 @@ INCLUDES = ../include/channel.h \
 	../include/version.h ../include/whowas.h
 
 MODULES= \
-	oldcloak.so sethost.so chghost.so chgident.so setname.so \
+	cloak_md5.so sethost.so chghost.so chgident.so setname.so \
 	setident.so sdesc.so svsmode.so swhois.so\
 	svsmotd.so svsnline.so who_old.so whox.so mkpasswd.so \
 	away.so svsnoop.so svsnick.so \
diff --git a/src/modules/oldcloak.c b/src/modules/cloak_md5.c
similarity index 97%
rename from src/modules/oldcloak.c
rename to src/modules/cloak_md5.c
index 21d162a10..dbe37cb11 100644
--- a/src/modules/oldcloak.c
+++ b/src/modules/cloak_md5.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/oldcloak.c
+ *   IRC - Internet Relay Chat, src/modules/cloak_md5.c
  *   (C) 2004-2017 Bram Matthys and The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
@@ -49,9 +49,9 @@ static inline unsigned int downsample(char *i);
 Callback *cloak = NULL, *cloak_csum = NULL;
 
 ModuleHeader MOD_HEADER = {
-	"oldcloak",
+	"cloak_md5",
 	"1.0",
-	"Old cloaking module (md5)",
+	"Old cloaking module (MD5)",
 	"UnrealIRCd Team",
 	"unrealircd-6",
 };
@@ -61,13 +61,13 @@ MOD_TEST()
 	cloak = CallbackAddString(modinfo->handle, CALLBACKTYPE_CLOAK_EX, hidehost);
 	if (!cloak)
 	{
-		config_error("cloak: Error while trying to install cloaking callback!");
+		config_error("cloak_md5: Error while trying to install cloaking callback!");
 		return MOD_FAILED;
 	}
 	cloak_csum = CallbackAddString(modinfo->handle, CALLBACKTYPE_CLOAK_KEY_CHECKSUM, cloakcsum);
 	if (!cloak_csum)
 	{
-		config_error("cloak: Error while trying to install cloaking checksum callback!");
+		config_error("cloak_md5: Error while trying to install cloaking checksum callback!");
 		return MOD_FAILED;
 	}
 	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, cloak_config_test);