diff --git a/plugins/Factoids.py b/plugins/Factoids.py
index 8519b3daa..6100a1941 100644
--- a/plugins/Factoids.py
+++ b/plugins/Factoids.py
@@ -189,7 +189,7 @@ class Factoids(plugins.ChannelDBHandler, callbacks.Privmsg):
         elif error:
             irc.error('No factoid matches that key.')
 
-    def invalidCommand(self, irc, msg, tokens):
+    def tokenizedCommand(self, irc, msg, tokens):
         if ircutils.isChannel(msg.args[0]):
             channel = msg.args[0]
             if self.registryValue('replyWhenInvalidCommand', channel):
diff --git a/plugins/MoobotFactoids.py b/plugins/MoobotFactoids.py
index bb13b347e..5f3dcd90f 100644
--- a/plugins/MoobotFactoids.py
+++ b/plugins/MoobotFactoids.py
@@ -335,7 +335,7 @@ class MoobotFactoids(callbacks.Privmsg):
         newfact = plugins.standardSubstitute(irc, msg, newfact)
         return (type, newfact)
 
-    def invalidCommand(self, irc, msg, tokens):
+    def tokenizedCommand(self, irc, msg, tokens):
         if '=~' in tokens:
             self.changeFactoid(irc, msg, tokens)
         elif tokens and tokens[0] in ('no', 'no,'):
@@ -662,7 +662,7 @@ class MoobotFactoids(callbacks.Privmsg):
         elif len(results) == 1 and \
              self.registryValue('showFactoidIfOnlyOneMatch', channel):
             key = results[0][0]
-            self.invalidCommand(irc, msg, [key])
+            self.tokenizedCommand(irc, msg, [key])
         else:
             keys = ['"%s"' % tup[0] for tup in results]
             s = 'Key search for "%s" (%s found): %s' % \