diff --git a/src/perl/common/Query.xs b/src/perl/common/Query.xs
index 135c6877..3af0b8d0 100644
--- a/src/perl/common/Query.xs
+++ b/src/perl/common/Query.xs
@@ -28,9 +28,9 @@ PPCODE:
 	}
 
 Irssi::Query
-query_create(chat_type, server, nick, automatic)
+query_create(chat_type, server_tag, nick, automatic)
 	int chat_type
-	Irssi::Server server
+	char *server_tag
 	char *nick
 	int automatic
 
diff --git a/src/perl/common/Server.xs b/src/perl/common/Server.xs
index aebc8e43..6bbd7752 100644
--- a/src/perl/common/Server.xs
+++ b/src/perl/common/Server.xs
@@ -106,11 +106,11 @@ OUTPUT:
 	RETVAL
 
 int
-ischannel(server, flag)
+ischannel(server, data)
 	Irssi::Server server
-	char flag
+	char *data
 CODE:
-	RETVAL = server->ischannel(flag);
+	RETVAL = server->ischannel(data);
 OUTPUT:
 	RETVAL
 
diff --git a/src/perl/irc/IrcQuery.xs b/src/perl/irc/IrcQuery.xs
index 3df52e86..db292852 100644
--- a/src/perl/irc/IrcQuery.xs
+++ b/src/perl/irc/IrcQuery.xs
@@ -1,7 +1,7 @@
 MODULE = Irssi::Irc	PACKAGE = Irssi::Irc::Server  PREFIX = irc_
 
 Irssi::Irc::Query
-irc_query_create(server, nick, automatic)
-	Irssi::Irc::Server server
+irc_query_create(server_tag, nick, automatic)
+	char *server_tag
 	char *nick
 	int automatic