-extern WMessage *mod_query_message(WMPlex *mplex, const char *p);
-extern WMessage *mod_query_fwarn(WMPlex *mplex, const char *p);
+extern WMessage *mod_query_do_message(WMPlex *mplex, const char *p);
+extern WMessage *mod_query_do_fwarn(WMPlex *mplex, const char *p);