diff --git a/src/core/misc.c b/src/core/misc.c
index 576d23f2..c66bbd6d 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -293,7 +293,7 @@ GList *optlist_remove_known(const char *cmd, GHashTable *optlist)
 	return list;
 }
 
-GList *glist_find_string(GList *list, const char *key)
+GList *i_list_find_string(GList *list, const char *key)
 {
 	for (; list != NULL; list = list->next)
 		if (g_strcmp0(list->data, key) == 0) return list;
@@ -301,7 +301,7 @@ GList *glist_find_string(GList *list, const char *key)
 	return NULL;
 }
 
-GList *glist_find_icase_string(GList *list, const char *key)
+GList *i_list_find_icase_string(GList *list, const char *key)
 {
 	for (; list != NULL; list = list->next)
 		if (g_ascii_strcasecmp(list->data, key) == 0) return list;
diff --git a/src/core/misc.h b/src/core/misc.h
index 0774bbba..76f5644b 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -21,8 +21,8 @@ long get_timeval_diff(const GTimeVal *tv1, const GTimeVal *tv2) G_GNUC_DEPRECATE
 
 GSList *i_slist_find_string(GSList *list, const char *key);
 GSList *i_slist_find_icase_string(GSList *list, const char *key);
-GList *glist_find_string(GList *list, const char *key);
-GList *glist_find_icase_string(GList *list, const char *key);
+GList *i_list_find_string(GList *list, const char *key);
+GList *i_list_find_icase_string(GList *list, const char *key);
 GSList *i_slist_remove_string(GSList *list, const char *str) G_GNUC_DEPRECATED;
 GSList *i_slist_delete_string(GSList *list, const char *str, GDestroyNotify free_func);
 
diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index fb052f7f..be16db7e 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -374,10 +374,10 @@ static void complete_from_nicklist(GList **outlist, CHANNEL_REC *channel,
 	for (tmp = mchannel->lastmsgs; tmp != NULL; tmp = tmp->next) {
 		LAST_MSG_REC *rec = tmp->data;
 
-		if ((match_case? strncmp(rec->nick, nick, len)
-		     : g_ascii_strncasecmp(rec->nick, nick, len)) == 0 &&
-		    (match_case? glist_find_string(*outlist, rec->nick)
-		     : glist_find_icase_string(*outlist, rec->nick)) == NULL) {
+		if ((match_case ? strncmp(rec->nick, nick, len) :
+		                  g_ascii_strncasecmp(rec->nick, nick, len)) == 0 &&
+		    (match_case ? i_list_find_string(*outlist, rec->nick) :
+		                  i_list_find_icase_string(*outlist, rec->nick)) == NULL) {
 			str = g_strconcat(rec->nick, suffix, NULL);
 			if (completion_lowercase) ascii_strdown(str);
 			if (rec->own)
@@ -435,7 +435,7 @@ static GList *completion_nicks_nonstrict(CHANNEL_REC *channel,
 			if (completion_lowercase)
 				ascii_strdown(tnick);
 
-			if (glist_find_icase_string(list, tnick) == NULL)
+			if (i_list_find_icase_string(list, tnick) == NULL)
 				list = g_list_append(list, tnick);
 			else
                                 g_free(tnick);
@@ -482,7 +482,7 @@ static GList *completion_channel_nicks(CHANNEL_REC *channel, const char *nick,
 			str = g_strconcat(rec->nick, suffix, NULL);
 			if (completion_lowercase)
 				ascii_strdown(str);
-                        if (glist_find_icase_string(list, str) == NULL)
+			if (i_list_find_icase_string(list, str) == NULL)
 				list = g_list_append(list, str);
 			else
                                 g_free(str);
@@ -505,7 +505,7 @@ static GList *completion_joinlist(GList *list1, GList *list2)
 
 	old = list2;
 	while (list2 != NULL) {
-		if (!glist_find_icase_string(list1, list2->data))
+		if (!i_list_find_icase_string(list1, list2->data))
 			list1 = g_list_append(list1, list2->data);
 		else
 			g_free(list2->data);
@@ -570,7 +570,7 @@ GList *completion_get_channels(SERVER_REC *server, const char *word)
 		CHANNEL_SETUP_REC *rec = tmp->data;
 
 		if (g_ascii_strncasecmp(rec->name, word, len) == 0 &&
-		    glist_find_icase_string(list, rec->name) == NULL)
+		    i_list_find_icase_string(list, rec->name) == NULL)
 			list = g_list_append(list, g_strdup(rec->name));
 
 	}
diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index a897c452..06ac124c 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -460,7 +460,7 @@ static GList *completion_get_aliases(const char *alias, char cmdchar)
 			/* add matching alias to completion list, aliases will
 			   be appended after command completions and kept in
 			   uppercase to show it's an alias */
-			if (glist_find_icase_string(complist, word) == NULL)
+			if (i_list_find_icase_string(complist, word) == NULL)
 				complist =
 				    g_list_insert_sorted(complist, word, (GCompareFunc) i_istr_cmp);
 			else
@@ -490,7 +490,7 @@ static GList *completion_get_commands(const char *cmd, char cmdchar)
 		if (g_ascii_strncasecmp(rec->cmd, cmd, len) == 0) {
 			word = cmdchar == '\0' ? g_strdup(rec->cmd) :
 				g_strdup_printf("%c%s", cmdchar, rec->cmd);
-			if (glist_find_icase_string(complist, word) == NULL)
+			if (i_list_find_icase_string(complist, word) == NULL)
 				complist =
 				    g_list_insert_sorted(complist, word, (GCompareFunc) i_istr_cmp);
 			else