diff --git a/lib/implugin.php b/lib/implugin.php
index 25c3e96f97..67b93047f1 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -106,7 +106,7 @@ abstract class ImPlugin extends Plugin
     /**
      * receive a raw message
      * Raw IM data is taken from the incoming queue, and passed to this function.
-     * It should parse the raw message and call handle_incoming()
+     * It should parse the raw message and call handleIncoming()
      * 
      * Returning false may CAUSE REPROCESSING OF THE QUEUE ITEM, and should
      * be used for temporary failures only. For permanent failures such as
@@ -436,7 +436,7 @@ abstract class ImPlugin extends Plugin
      *
      * @param boolean success
      */
-    protected function handle_incoming($from, $notice_text)
+    protected function handleIncoming($from, $notice_text)
     {
         $user = $this->get_user($from);
         // For common_current_user to work
diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index 3f394a7404..225d92ad6a 100644
--- a/plugins/Aim/AimPlugin.php
+++ b/plugins/Aim/AimPlugin.php
@@ -138,7 +138,7 @@ class AimPlugin extends ImPlugin
         $user = $this->get_user($from);
         $notice_text = $info['message'];
 
-        $this->handle_incoming($from, $notice_text);
+        $this->handleIncoming($from, $notice_text);
 
         return true;
     }
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index a5a343e02d..3e73c198cb 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -211,10 +211,10 @@ class IrcPlugin extends ImPlugin {
             if (in_array($command, $this->whiteList)) {
                 $this->handle_channel_incoming($data['sender'], $data['source'], $message);
             } else {
-                $this->handle_incoming($data['sender'], $message);
+                $this->handleIncoming($data['sender'], $message);
             }
         } else {
-            $this->handle_incoming($data['sender'], $data['message']);
+            $this->handleIncoming($data['sender'], $data['message']);
         }
         return true;
     }
diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 9912021d75..187486eedc 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -173,7 +173,7 @@ class MsnPlugin extends ImPlugin {
      * @return true if processing completed, false if message should be reprocessed
      */
     public function receiveRawMessage($data) {
-        $this->handle_incoming($data['sender'], $data['message']);
+        $this->handleIncoming($data['sender'], $data['message']);
         return true;
     }
 
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 10141b08d5..2002541782 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -378,7 +378,7 @@ class XmppPlugin extends ImPlugin
             return;
         }
 
-        $this->handle_incoming($from, $pl['body']);
+        $this->handleIncoming($from, $pl['body']);
         
         return true;
     }