diff --git a/docs/conf/modules.example.conf b/docs/conf/modules.example.conf
index e174b00f7..3bd950f73 100644
--- a/docs/conf/modules.example.conf
+++ b/docs/conf/modules.example.conf
@@ -118,10 +118,10 @@
 # An example of using the format value to create an alias with two
 # different behaviours depending on the format of the parameters.
 #
-#<alias text="ID" format="#*" replace="SQUERY ChanServ :IDENTIFY $2 $3"
+#<alias text="ID" format="#*" replace="PRIVMSG ChanServ :IDENTIFY $2 $3"
 #  requires="ChanServ" service="yes">
 #
-#<alias text="ID" replace="SQUERY NickServ :IDENTIFY $2"
+#<alias text="ID" replace="PRIVMSG NickServ :IDENTIFY $2"
 #  requires="NickServ" service="yes">
 #
 # You may also add aliases to trigger based on something said in a
@@ -130,7 +130,7 @@
 # command must be preceded by the fantasy prefix when used.
 #
 #<alias text="CS" usercommand="no" channelcommand="yes"
-#  replace="SQUERY ChanServ :$1 $chan $2-" requires="ChanServ" service="yes">
+#  replace="PRIVMSG ChanServ :$1 $chan $2-" requires="ChanServ" service="yes">
 #
 # This would be used as "!cs <command> <options>", with the channel
 # being automatically inserted after the command in the message to
diff --git a/docs/conf/services/atheme.example.conf b/docs/conf/services/atheme.example.conf
index 507ec7c8b..1f5883239 100644
--- a/docs/conf/services/atheme.example.conf
+++ b/docs/conf/services/atheme.example.conf
@@ -6,27 +6,27 @@
 <include file="&dir.example;/services/generic.example.conf">
 
 # Long hand aliases for services pseudoclients.
-<alias text="ALIS"      replace="SQUERY $requirement :$2-" requires="ALIS"      service="yes">
-<alias text="CHANFIX"   replace="SQUERY $requirement :$2-" requires="ChanFix"   service="yes">
-<alias text="GAMESERV"  replace="SQUERY $requirement :$2-" requires="GameServ"  service="yes">
-<alias text="GROUPSERV" replace="SQUERY $requirement :$2-" requires="GroupServ" service="yes">
-<alias text="HELPSERV"  replace="SQUERY $requirement :$2-" requires="HelpServ"  service="yes">
-<alias text="INFOSERV"  replace="SQUERY $requirement :$2-" requires="InfoServ"  service="yes">
-<alias text="PROXYSCAN" replace="SQUERY $requirement :$2-" requires="Proxyscan" service="yes" operonly="yes">
-<alias text="RPGSERV"   replace="SQUERY $requirement :$2-" requires="RPGServ"   service="yes">
+<alias text="ALIS"      replace="PRIVMSG $requirement :$2-" requires="ALIS"      service="yes">
+<alias text="CHANFIX"   replace="PRIVMSG $requirement :$2-" requires="ChanFix"   service="yes">
+<alias text="GAMESERV"  replace="PRIVMSG $requirement :$2-" requires="GameServ"  service="yes">
+<alias text="GROUPSERV" replace="PRIVMSG $requirement :$2-" requires="GroupServ" service="yes">
+<alias text="HELPSERV"  replace="PRIVMSG $requirement :$2-" requires="HelpServ"  service="yes">
+<alias text="INFOSERV"  replace="PRIVMSG $requirement :$2-" requires="InfoServ"  service="yes">
+<alias text="PROXYSCAN" replace="PRIVMSG $requirement :$2-" requires="Proxyscan" service="yes" operonly="yes">
+<alias text="RPGSERV"   replace="PRIVMSG $requirement :$2-" requires="RPGServ"   service="yes">
 
 # Short hand aliases for services pseudoclients.
-<alias text="CF" replace="SQUERY $requirement :$2-" requires="ChanFix"   service="yes">
-<alias text="GS" replace="SQUERY $requirement :$2-" requires="GroupServ" service="yes">
-<alias text="IS" replace="SQUERY $requirement :$2-" requires="InfoServ"  service="yes">
-<alias text="LS" replace="SQUERY $requirement :$2-" requires="ALIS"      service="yes">
-<alias text="PS" replace="SQUERY $requirement :$2-" requires="Proxyscan" service="yes" operonly="yes">
-<alias text="RS" replace="SQUERY $requirement :$2-" requires="RPGServ"   service="yes">
+<alias text="CF" replace="PRIVMSG $requirement :$2-" requires="ChanFix"   service="yes">
+<alias text="GS" replace="PRIVMSG $requirement :$2-" requires="GroupServ" service="yes">
+<alias text="IS" replace="PRIVMSG $requirement :$2-" requires="InfoServ"  service="yes">
+<alias text="LS" replace="PRIVMSG $requirement :$2-" requires="ALIS"      service="yes">
+<alias text="PS" replace="PRIVMSG $requirement :$2-" requires="Proxyscan" service="yes" operonly="yes">
+<alias text="RS" replace="PRIVMSG $requirement :$2-" requires="RPGServ"   service="yes">
 
 # These short hand aliases conflict with other pseudoclients. You can enable
 # them but you will need to comment out the uncommented ones above first,
-#<alias text="GS" replace="SQUERY $requirement :$2-" requires="GameServ" service="yes">
-#<alias text="HS" replace="SQUERY $requirement :$2-" requires="HelpServ" service="yes">
+#<alias text="GS" replace="PRIVMSG $requirement :$2-" requires="GameServ" service="yes">
+#<alias text="HS" replace="PRIVMSG $requirement :$2-" requires="HelpServ" service="yes">
 
 # Prevent clients from using the nicknames of services pseudoclients.
 <badnick nick="ALIS"      reason="Reserved for a network service">
diff --git a/docs/conf/services/generic.example.conf b/docs/conf/services/generic.example.conf
index 7adf5d5be..649dd4b49 100644
--- a/docs/conf/services/generic.example.conf
+++ b/docs/conf/services/generic.example.conf
@@ -4,34 +4,34 @@
 <module name="alias">
 
 # Long hand aliases for services pseudoclients.
-<alias text="BOTSERV"  replace="SQUERY $requirement :$2-" requires="BotServ"  service="yes">
-<alias text="CHANSERV" replace="SQUERY $requirement :$2-" requires="ChanServ" service="yes">
-<alias text="GLOBAL"   replace="SQUERY $requirement :$2-" requires="Global"   service="yes" operonly="yes">
-<alias text="HOSTSERV" replace="SQUERY $requirement :$2-" requires="HostServ" service="yes">
-<alias text="MEMOSERV" replace="SQUERY $requirement :$2-" requires="MemoServ" service="yes">
-<alias text="NICKSERV" replace="SQUERY $requirement :$2-" requires="NickServ" service="yes">
-<alias text="OPERSERV" replace="SQUERY $requirement :$2-" requires="OperServ" service="yes" operonly="yes">
-<alias text="STATSERV" replace="SQUERY $requirement :$2-" requires="StatServ" service="yes">
+<alias text="BOTSERV"  replace="PRIVMSG $requirement :$2-" requires="BotServ"  service="yes">
+<alias text="CHANSERV" replace="PRIVMSG $requirement :$2-" requires="ChanServ" service="yes">
+<alias text="GLOBAL"   replace="PRIVMSG $requirement :$2-" requires="Global"   service="yes" operonly="yes">
+<alias text="HOSTSERV" replace="PRIVMSG $requirement :$2-" requires="HostServ" service="yes">
+<alias text="MEMOSERV" replace="PRIVMSG $requirement :$2-" requires="MemoServ" service="yes">
+<alias text="NICKSERV" replace="PRIVMSG $requirement :$2-" requires="NickServ" service="yes">
+<alias text="OPERSERV" replace="PRIVMSG $requirement :$2-" requires="OperServ" service="yes" operonly="yes">
+<alias text="STATSERV" replace="PRIVMSG $requirement :$2-" requires="StatServ" service="yes">
 
 # Short hand aliases for services pseudoclients.
-<alias text="BS" replace="SQUERY $requirement :$2-" requires="BotServ"  service="yes">
-<alias text="CS" replace="SQUERY $requirement :$2-" requires="ChanServ" service="yes">
-<alias text="GL" replace="SQUERY $requirement :$2-" requires="Global"   service="yes" operonly="yes">
-<alias text="HS" replace="SQUERY $requirement :$2-" requires="HostServ" service="yes">
-<alias text="MS" replace="SQUERY $requirement :$2-" requires="MemoServ" service="yes">
-<alias text="NS" replace="SQUERY $requirement :$2-" requires="NickServ" service="yes">
-<alias text="OS" replace="SQUERY $requirement :$2-" requires="OperServ" service="yes" operonly="yes">
-<alias text="SS" replace="SQUERY $requirement :$2-" requires="StatServ" service="yes">
+<alias text="BS" replace="PRIVMSG $requirement :$2-" requires="BotServ"  service="yes">
+<alias text="CS" replace="PRIVMSG $requirement :$2-" requires="ChanServ" service="yes">
+<alias text="GL" replace="PRIVMSG $requirement :$2-" requires="Global"   service="yes" operonly="yes">
+<alias text="HS" replace="PRIVMSG $requirement :$2-" requires="HostServ" service="yes">
+<alias text="MS" replace="PRIVMSG $requirement :$2-" requires="MemoServ" service="yes">
+<alias text="NS" replace="PRIVMSG $requirement :$2-" requires="NickServ" service="yes">
+<alias text="OS" replace="PRIVMSG $requirement :$2-" requires="OperServ" service="yes" operonly="yes">
+<alias text="SS" replace="PRIVMSG $requirement :$2-" requires="StatServ" service="yes">
 
 # /ID [account] <password>
 # Identifies to a services account.
-<alias text="ID"       format="*" replace="SQUERY $requirement :IDENTIFY $2-" requires="NickServ" service="yes">
-<alias text="IDENTIFY" format="*" replace="SQUERY $requirement :IDENTIFY $2-" requires="NickServ" service="yes">
-<alias text="LOGIN"    format="*" replace="SQUERY $requirement :IDENTIFY $2-" requires="NickServ" service="yes">
+<alias text="ID"       format="*" replace="PRIVMSG $requirement :IDENTIFY $2-" requires="NickServ" service="yes">
+<alias text="IDENTIFY" format="*" replace="PRIVMSG $requirement :IDENTIFY $2-" requires="NickServ" service="yes">
+<alias text="LOGIN"    format="*" replace="PRIVMSG $requirement :IDENTIFY $2-" requires="NickServ" service="yes">
 
 # /LOGOUT
 # Logs out of a services account.
-<alias text="LOGOUT" format="*" replace="SQUERY $requirement :LOGOUT" requires="NickServ" service="yes">
+<alias text="LOGOUT" format="*" replace="PRIVMSG $requirement :LOGOUT" requires="NickServ" service="yes">
 
 # Prevent clients from using the nicknames of services pseudoclients.
 <badnick nick="BotServ"  reason="Reserved for a network service">