diff --git a/libertree/libertree.php b/libertree/libertree.php
index aa4c48b71..19512bc54 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -181,7 +181,7 @@ function libertree_send(&$a,&$b) {
 	$ltree_api_token = PConfig::get($b['uid'],'libertree','libertree_api_token');
 	$ltree_url = PConfig::get($b['uid'],'libertree','libertree_url');
 	$ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token";
-	$ltree_source = $a->get_hostname();
+	$ltree_source = $a->getHostName();
 
 	if ($b['app'] != "")
 		$ltree_source .= " (".$b['app'].")";
diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 5d9153d43..dc44b931d 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -91,7 +91,7 @@ function mailstream_addon_admin_post ($a) {
 
 function mailstream_generate_id($a, $uri) {
 	// http://www.jwz.org/doc/mid.html
-	$host = $a->get_hostname();
+	$host = $a->getHostName();
 	$resource = hash('md5', $uri);
 	$message_id = "<" . $resource . "@" . $host . ">";
 	logger('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri, LOGGER_DEBUG);
diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index ddadc3b62..a01930392 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -53,7 +53,7 @@ function notifyall_post(App $a)
 	}
 
 	if (! x(Config::get('config', 'sender_email'))) {
-		$sender_email = 'noreply@' . $a->get_hostname();
+		$sender_email = 'noreply@' . $a->getHostName();
 	} else {
 		$sender_email = Config::get('config', 'sender_email');
 	}
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 2bb523315..6217f4d53 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -102,7 +102,7 @@ function pumpio_registerclient(App $a, $host)
 	$application_name  = Config::get('pumpio', 'application_name');
 
 	if ($application_name == "") {
-		$application_name = $a->get_hostname();
+		$application_name = $a->getHostName();
 	}
 
 	$adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
@@ -749,7 +749,7 @@ function pumpio_fetchtimeline(App $a, $uid)
 		$application_name  = Config::get('pumpio', 'application_name');
 	}
 	if ($application_name == "") {
-		$application_name = $a->get_hostname();
+		$application_name = $a->getHostName();
 	}
 
 	$first_time = ($lastdate == "");
diff --git a/securemail/securemail.php b/securemail/securemail.php
index 87941e797..d935160e0 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -97,7 +97,7 @@ function securemail_settings_post(App &$a, array &$b){
         if ($_POST['securemail-submit'] == L10n::t('Save and send test')) {
             $sitename = Config::get('config', 'sitename');
 
-            $hostname = $a->get_hostname();
+            $hostname = $a->getHostName();
             if (strpos($hostname, ':')) {
                 $hostname = substr($hostname, 0, strpos($hostname, ':'));
             }
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 08c2645bc..2e6a1f925 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -791,7 +791,7 @@ function statusnet_fetchtimeline(App $a, $uid)
 		$application_name = Config::get('statusnet', 'application_name');
 	}
 	if ($application_name == "") {
-		$application_name = $a->get_hostname();
+		$application_name = $a->getHostName();
 	}
 
 	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 54c330c76..5a808d39f 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -866,7 +866,7 @@ function twitter_fetchtimeline(App $a, $uid)
 	$application_name = Config::get('twitter', 'application_name');
 
 	if ($application_name == "") {
-		$application_name = $a->get_hostname();
+		$application_name = $a->getHostName();
 	}
 
 	$has_picture = false;
@@ -1597,7 +1597,7 @@ function twitter_fetchhometimeline(App $a, $uid)
 	$application_name = Config::get('twitter', 'application_name');
 
 	if ($application_name == "") {
-		$application_name = $a->get_hostname();
+		$application_name = $a->getHostName();
 	}
 
 	require_once 'include/items.php';
diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index 0f8d4b1c1..e45bd72ea 100644
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -164,7 +164,7 @@ function xmpp_converse(App $a)
 			PConfig::set(local_user(), "xmpp", "password", $password);
 		}
 
-		$jid = $a->user["nickname"] . "@" . $a->get_hostname() . "/converse-" . random_string(5);
+		$jid = $a->user["nickname"] . "@" . $a->getHostName() . "/converse-" . random_string(5);
 
 		$auto_login = "auto_login: true,
 			authentication: 'login',