diff --git a/include/hash2.h b/include/hash2.h
index 0a31fc5..cb1fada 100644
--- a/include/hash2.h
+++ b/include/hash2.h
@@ -19,7 +19,7 @@
 
 /* Generic List type hash list */
 void	BX_add_name_to_genericlist (char *, HashEntry *, unsigned int);
-List	*BX_find_name_in_genericlist (char *, HashEntry *, unsigned int, int);
+List	*BX_find_name_in_genericlist (const char *, HashEntry *, unsigned int, int);
 List	*BX_next_namelist(HashEntry *, List *, unsigned int);
 
 void	BX_add_nicklist_to_channellist(NickList *, ChannelList *);
diff --git a/include/modval.h b/include/modval.h
index 8cea487..d9f609b 100644
--- a/include/modval.h
+++ b/include/modval.h
@@ -444,7 +444,7 @@ extern Function_ptr *global;
 #define next_nicklist (*(NickList *(*)(ChannelList *, NickList *))global[NEXT_NICKLIST])
 #define next_namelist (*(List *(*)(HashEntry *, List *, unsigned int))global[NEXT_NAMELIST])
 #define add_name_to_genericlist (*(void (*)(char *, HashEntry *, unsigned int))global[ADD_NAME_TO_GENERICLIST])
-#define find_name_in_genericlist (*(List *(*)(char *, HashEntry *, unsigned int, int))global[FIND_NAME_IN_GENERICLIST])
+#define find_name_in_genericlist (*(List *(*)(const char *, HashEntry *, unsigned int, int))global[FIND_NAME_IN_GENERICLIST])
 #define add_whowas_userhost_channel (*(void (*)(WhowasList *, WhowasWrapList *))global[ADD_WHOWAS_USERHOST_CHANNEL])
 #define find_userhost_channel (*(WhowasList *(*)(char *, char *, int, WhowasWrapList *))global[FIND_USERHOST_CHANNEL])
 #define next_userhost (*(WhowasList *(*)(WhowasWrapList *, WhowasList *))global[NEXT_USERHOST])
diff --git a/source/hash.c b/source/hash.c
index 969f57f..480762d 100644
--- a/source/hash.c
+++ b/source/hash.c
@@ -147,11 +147,11 @@ static inline void remove_gen_link_from_list(List *tmp, List *prev, HashEntry *l
 	tmp->next = NULL;
 }
 
-List *BX_find_name_in_genericlist(char *name, HashEntry *list, unsigned int size, int remove)
+List *BX_find_name_in_genericlist(const char *name, HashEntry *list, unsigned int size, int remove)
 {
 	HashEntry *location;
-	register List *tmp, *prev = NULL;
-	unsigned long hvalue = hash_nickname(name, size);
+	List *tmp, *prev = NULL;
+	const unsigned long hvalue = hash_nickname(name, size);
 
 	location = &(list[hvalue]);