diff --git a/gatchat/gatchat.c b/gatchat/gatchat.c
index 7a0ef359..ebecd4be 100644
--- a/gatchat/gatchat.c
+++ b/gatchat/gatchat.c
@@ -535,10 +535,10 @@ static gboolean at_chat_handle_command_response(struct at_chat *p,
 	}
 
 	if (cmd->prefixes) {
-		int i;
+		int n;
 
-		for (i = 0; cmd->prefixes[i]; i++)
-			if (g_str_has_prefix(line, cmd->prefixes[i]))
+		for (n = 0; cmd->prefixes[n]; n++)
+			if (g_str_has_prefix(line, cmd->prefixes[n]))
 				goto out;
 
 		return FALSE;
diff --git a/gatchat/gatmux.c b/gatchat/gatmux.c
index 20224dc5..9beeece3 100644
--- a/gatchat/gatmux.c
+++ b/gatchat/gatmux.c
@@ -242,7 +242,7 @@ static void write_watcher_destroy_notify(gpointer user_data)
 	mux->write_watch = 0;
 }
 
-static gboolean can_write_data(GIOChannel *channel, GIOCondition cond,
+static gboolean can_write_data(GIOChannel *chan, GIOCondition cond,
 				gpointer data)
 {
 	GAtMux *mux = data;