diff --git a/include/hash_management.h b/include/hashes.h
similarity index 100%
rename from include/hash_management.h
rename to include/hashes.h
diff --git a/src/Makefile b/src/Makefile
index 9d90de5f9..85cac2cd1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -163,7 +163,7 @@ LFLAGS_CROSS_WIN         := -lpsapi
 ## Objects
 ##
 
-OBJS_ALL                 := affinity autotune benchmark bitmap bitops combinator common convert cpt cpu_aes cpu_crc32 cpu_des cpu_md5 cpu_sha1 cpu_sha256 data debugfile dictstat dispatch dynloader ext_ADL ext_nvapi ext_nvml ext_OpenCL ext_xnvctrl filehandling folder hash_management hlfmt hwmon induct interface locking logfile logging loopback memory monitor mpsp opencl outfile_check outfile potfile restore rp rp_cpu rp_kernel_on_cpu shared status stdout straight terminal thread timer tuningdb usage user_options weak_hash wordlist
+OBJS_ALL                 := affinity autotune benchmark bitmap bitops combinator common convert cpt cpu_aes cpu_crc32 cpu_des cpu_md5 cpu_sha1 cpu_sha256 data debugfile dictstat dispatch dynloader ext_ADL ext_nvapi ext_nvml ext_OpenCL ext_xnvctrl filehandling folder hashes hlfmt hwmon induct interface locking logfile logging loopback memory monitor mpsp opencl outfile_check outfile potfile restore rp rp_cpu rp_kernel_on_cpu shared status stdout straight terminal thread timer tuningdb usage user_options weak_hash wordlist
 
 NATIVE_OBJS              := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).NATIVE.o)
 
diff --git a/src/dispatch.c b/src/dispatch.c
index fc946c418..db73619a8 100644
--- a/src/dispatch.c
+++ b/src/dispatch.c
@@ -20,7 +20,7 @@
 #include "opencl.h"
 #include "hwmon.h"
 #include "restore.h"
-#include "hash_management.h"
+#include "hashes.h"
 #include "rp_cpu.h"
 #include "terminal.h"
 #include "mpsp.h"
diff --git a/src/hashcat.c b/src/hashcat.c
index bb527f03f..9cc8aae6c 100644
--- a/src/hashcat.c
+++ b/src/hashcat.c
@@ -30,7 +30,7 @@
 #include "debugfile.h"
 #include "dictstat.h"
 #include "dispatch.h"
-#include "hash_management.h"
+#include "hashes.h"
 #include "hwmon.h"
 #include "induct.h"
 #include "interface.h"
diff --git a/src/hash_management.c b/src/hashes.c
similarity index 99%
rename from src/hash_management.c
rename to src/hashes.c
index 9cb1cc8eb..e26355349 100644
--- a/src/hash_management.c
+++ b/src/hashes.c
@@ -22,7 +22,7 @@
 #include "opencl.h"
 #include "hwmon.h"
 #include "restore.h"
-#include "hash_management.h"
+#include "hashes.h"
 #include "filehandling.h"
 #include "outfile.h"
 #include "potfile.h"
diff --git a/src/monitor.c b/src/monitor.c
index a376d6a46..dde28d40b 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -21,7 +21,7 @@
 #include "opencl.h"
 #include "hwmon.h"
 #include "restore.h"
-#include "hash_management.h"
+#include "hashes.h"
 #include "outfile.h"
 #include "potfile.h"
 #include "debugfile.h"
diff --git a/src/opencl.c b/src/opencl.c
index f3bb5557f..90c8f75c5 100644
--- a/src/opencl.c
+++ b/src/opencl.c
@@ -22,7 +22,7 @@
 #include "interface.h"
 #include "wordlist.h"
 #include "shared.h"
-#include "hash_management.h"
+#include "hashes.h"
 #include "cpu_md5.h"
 #include "opencl.h"
 
diff --git a/src/outfile.c b/src/outfile.c
index 6fc94c75a..134f68661 100644
--- a/src/outfile.c
+++ b/src/outfile.c
@@ -7,7 +7,7 @@
 #include "types.h"
 #include "logging.h"
 #include "interface.h"
-#include "hash_management.h"
+#include "hashes.h"
 #include "outfile.h"
 
 void outfile_init (outfile_ctx_t *outfile_ctx, const user_options_t *user_options)
diff --git a/src/outfile_check.c b/src/outfile_check.c
index 66c7c7b12..c876a209f 100644
--- a/src/outfile_check.c
+++ b/src/outfile_check.c
@@ -22,7 +22,7 @@
 #include "opencl.h"
 #include "hwmon.h"
 #include "restore.h"
-#include "hash_management.h"
+#include "hashes.h"
 #include "outfile.h"
 #include "potfile.h"
 #include "debugfile.h"
diff --git a/src/terminal.c b/src/terminal.c
index 7cd2527aa..007639e08 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -20,7 +20,7 @@
 #include "opencl.h"
 #include "hwmon.h"
 #include "restore.h"
-#include "hash_management.h"
+#include "hashes.h"
 #include "outfile.h"
 #include "potfile.h"
 #include "debugfile.h"
diff --git a/src/thread.c b/src/thread.c
index 4f9d43a43..eba1eed9f 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -20,7 +20,7 @@
 #include "opencl.h"
 #include "hwmon.h"
 #include "restore.h"
-#include "hash_management.h"
+#include "hashes.h"
 #include "rp_cpu.h"
 #include "terminal.h"
 #include "mpsp.h"
diff --git a/src/tuningdb.c b/src/tuningdb.c
index 948dc8482..99d87327c 100644
--- a/src/tuningdb.c
+++ b/src/tuningdb.c
@@ -14,7 +14,7 @@
 #include "tuningdb.h"
 #include "thread.h"
 #include "opencl.h"
-#include "hash_management.h"
+#include "hashes.h"
 
 static int sort_by_tuning_db_alias (const void *v1, const void *v2)
 {
diff --git a/src/weak_hash.c b/src/weak_hash.c
index fc36083d7..0dec6603e 100644
--- a/src/weak_hash.c
+++ b/src/weak_hash.c
@@ -7,7 +7,7 @@
 #include "types.h"
 #include "logging.h"
 #include "opencl.h"
-#include "hash_management.h"
+#include "hashes.h"
 #include "weak_hash.h"
 
 void weak_hash_check (opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, const user_options_t *user_options, const user_options_extra_t *user_options_extra, const straight_ctx_t *straight_ctx, const combinator_ctx_t *combinator_ctx, hashconfig_t *hashconfig, hashes_t *hashes, cpt_ctx_t *cpt_ctx, status_ctx_t *status_ctx, const uint salt_pos)