diff --git a/degesch.c b/degesch.c
index ead3247..f108c1e 100644
--- a/degesch.c
+++ b/degesch.c
@@ -1300,7 +1300,7 @@ irc_make_user (struct app_context *ctx, char *nickname)
 }
 
 static struct buffer *
-irc_get_user_buffer (struct app_context *ctx, const char *nickname)
+irc_get_or_make_user_buffer (struct app_context *ctx, const char *nickname)
 {
 	struct buffer *buffer = str_map_find (&ctx->irc_buffer_map, nickname);
 	if (buffer)
@@ -2138,7 +2138,7 @@ irc_handle_privmsg (struct app_context *ctx, const struct irc_message *msg)
 	else if (!buffer)
 	{
 		char *nickname = irc_cut_nickname (msg->prefix);
-		buffer = irc_get_user_buffer (ctx, nickname);
+		buffer = irc_get_or_make_user_buffer (ctx, nickname);
 		free (nickname);
 	}
 
@@ -2705,7 +2705,7 @@ handle_command_query (struct app_context *ctx, char *arguments)
 		buffer_send_error (ctx, ctx->server_buffer, "No text to send");
 	else
 	{
-		buffer_activate (ctx, irc_get_user_buffer (ctx, target));
+		buffer_activate (ctx, irc_get_or_make_user_buffer (ctx, target));
 		SEND_AUTOSPLIT_PRIVMSG (ctx, target, arguments);
 	}
 }