diff --git a/irc/channel.go b/irc/channel.go
index ed8c05f8..e9773f46 100644
--- a/irc/channel.go
+++ b/irc/channel.go
@@ -1571,7 +1571,7 @@ func (channel *Channel) Uninvite(invitee *Client, inviter *Client, rb *ResponseB
 	}
 
 	if !channel.ClientIsAtLeast(inviter, modes.ChannelOperator) {
-		rb.Add(nil, channel.server.name, "FAIL", "UNINVITE", "NOT_PRIVED", channel.Name(), inviter.t("You're not a channel operator"))
+		rb.Add(nil, channel.server.name, "FAIL", "UNINVITE", "PRIVS_NEEDED", channel.Name(), inviter.t("You're not a channel operator"))
 		return
 	}
 
diff --git a/irc/handlers.go b/irc/handlers.go
index 19de3fa4..52991d62 100644
--- a/irc/handlers.go
+++ b/irc/handlers.go
@@ -2548,7 +2548,7 @@ func relaymsgHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *
 
 	allowedToRelay := client.HasRoleCapabs("relaymsg") || (config.Server.Relaymsg.AvailableToChanops && channel.ClientIsAtLeast(client, modes.ChannelOperator))
 	if !allowedToRelay {
-		rb.Add(nil, server.name, "FAIL", "RELAYMSG", "NOT_PRIVED", client.t("You cannot relay messages to this channel"))
+		rb.Add(nil, server.name, "FAIL", "RELAYMSG", "PRIVS_NEEDED", client.t("You cannot relay messages to this channel"))
 		return false
 	}
 
diff --git a/irctest b/irctest
index 8c66157a..5aeb297d 160000
--- a/irctest
+++ b/irctest
@@ -1 +1 @@
-Subproject commit 8c66157a9ea22a824dc55210903222889cc3672d
+Subproject commit 5aeb297de549c714ca692eda87d72b179d039ca6