diff --git a/lib/implugin.php b/lib/implugin.php
index b1b918fea5..a6a30b042f 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -168,7 +168,7 @@ abstract class ImPlugin extends Plugin
      *
      * @return User user
      */
-    function get_user($screenname)
+    function getUser($screenname)
     {
         $user_im_prefs = $this->getUserImPrefsFromScreenname($screenname);
         if($user_im_prefs){
@@ -438,7 +438,7 @@ abstract class ImPlugin extends Plugin
      */
     protected function handleIncoming($from, $notice_text)
     {
-        $user = $this->get_user($from);
+        $user = $this->getUser($from);
         // For common_current_user to work
         global $_cur;
         $_cur = $user;
diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index 225d92ad6a..3a1799a2d8 100644
--- a/plugins/Aim/AimPlugin.php
+++ b/plugins/Aim/AimPlugin.php
@@ -135,7 +135,7 @@ class AimPlugin extends ImPlugin
     {
         $info=Aim::getMessageInfo($message);
         $from = $info['from'];
-        $user = $this->get_user($from);
+        $user = $this->getUser($from);
         $notice_text = $info['message'];
 
         $this->handleIncoming($from, $notice_text);
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index b688e6140b..55645d92fd 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -229,7 +229,7 @@ class IrcPlugin extends ImPlugin {
      * @param boolean true on success
      */
     protected function handle_channel_incoming($nick, $channel, $notice_text) {
-        $user = $this->get_user($nick);
+        $user = $this->getUser($nick);
         // For common_current_user to work
         global $_cur;
         $_cur = $user;