diff --git a/actions/imsettings.php b/actions/imsettings.php
index 662b1063e7..1b1bc0dc0d 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -133,7 +133,7 @@ class ImsettingsAction extends ConnectSettingsAction
                                              'message with further instructions. '.
                                              '(Did you add %s to your buddy list?)'),
                                              $transport_info['display'],
-                                             $transport_info['daemon_screenname']));
+                                             $transport_info['daemonScreenname']));
                     $this->hidden('screenname', $confirm->address);
                     // TRANS: Button label to cancel an IM address confirmation procedure.
                     $this->submit('cancel', _m('BUTTON','Cancel'));
diff --git a/lib/implugin.php b/lib/implugin.php
index 8cbf7d33ed..8a208221af 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -124,7 +124,7 @@ abstract class ImPlugin extends Plugin
      *
      * @return string screenname of this plugin
      */
-    abstract function daemon_screenname();
+    abstract function daemonScreenname();
 
     /**
      * get the microid uri of a given screenname
@@ -599,7 +599,7 @@ abstract class ImPlugin extends Plugin
     {
         $transports[$this->transport] = array(
             'display' => $this->getDisplayName(),
-            'daemon_screenname' => $this->daemon_screenname());
+            'daemonScreenname' => $this->daemonScreenname());
     }
 
     function onSendImConfirmationCode($transport, $screenname, $code, $user)
diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index 1d06a8bda6..231dc0b271 100644
--- a/plugins/Aim/AimPlugin.php
+++ b/plugins/Aim/AimPlugin.php
@@ -66,7 +66,7 @@ class AimPlugin extends ImPlugin
         return strtolower($screenname);
     }
 
-    function daemon_screenname()
+    function daemonScreenname()
     {
         return $this->user;
     }
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index 5434c4e7d0..bebd0eaf3a 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -95,7 +95,7 @@ class IrcPlugin extends ImPlugin {
      *
      * @return string Screenname
      */
-    public function daemon_screenname() {
+    public function daemonScreenname() {
         return $this->nick;
     }
 
diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index a112a2070c..68e57fa09e 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -78,7 +78,7 @@ class MsnPlugin extends ImPlugin {
      *
      * @return string Screenname
      */
-    public function daemon_screenname() {
+    public function daemonScreenname() {
         return $this->user;
     }
 
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 2cdc3272df..321496e7de 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -254,7 +254,7 @@ class XmppPlugin extends ImPlugin
         return false;
     }
 
-    function daemon_screenname()
+    function daemonScreenname()
     {
         $ret = $this->user . '@' . $this->server;
         if($this->resource)
diff --git a/plugins/Xmpp/xmppmanager.php b/plugins/Xmpp/xmppmanager.php
index 87d8186684..c9cb49dd19 100644
--- a/plugins/Xmpp/xmppmanager.php
+++ b/plugins/Xmpp/xmppmanager.php
@@ -184,7 +184,7 @@ class XmppManager extends ImManager
         }
 
         common_log(LOG_DEBUG, "Sending ping #{$this->pingid}");
-		$this->conn->send("<iq from='{" . $this->plugin->daemon_screenname() . "}' to='{$this->plugin->server}' id='ping_{$this->pingid}' type='get'><ping xmlns='urn:xmpp:ping'/></iq>");
+		$this->conn->send("<iq from='{" . $this->plugin->daemonScreenname() . "}' to='{$this->plugin->server}' id='ping_{$this->pingid}' type='get'><ping xmlns='urn:xmpp:ping'/></iq>");
         $this->lastping = $now;
         return true;
     }