diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 0d847b14..eb7e521b 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -18,6 +18,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Core\Worker;
+use Friendica\DI;
 
 function diaspora_install()
 {
@@ -231,7 +232,7 @@ function diaspora_post_local(App $a, array &$b)
 
 function diaspora_send(App $a, array &$b)
 {
-	$hostname = $a->getHostName();
+	$hostname = DI::baseUrl()->getHostname();
 
 	Logger::log('diaspora_send: invoked');
 
diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 8205e200..c470cb4e 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -57,7 +57,7 @@ function notifyall_post(App $a)
 	}
 
 	if (!Config::get('config', 'sender_email')) {
-		$sender_email = 'noreply@' . $a->getHostName();
+		$sender_email = 'noreply@' . DI::baseUrl()->getHostname();
 	} else {
 		$sender_email = Config::get('config', 'sender_email');
 	}
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index e8b740c2..18ab5f41 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -17,6 +17,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
@@ -105,7 +106,7 @@ function pumpio_registerclient(App $a, $host)
 	$application_name  = Config::get('pumpio', 'application_name');
 
 	if ($application_name == "") {
-		$application_name = $a->getHostName();
+		$application_name = DI::baseUrl()->getHostname();
 	}
 
 	$adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
@@ -772,7 +773,7 @@ function pumpio_fetchtimeline(App $a, $uid)
 		$application_name  = Config::get('pumpio', 'application_name');
 	}
 	if ($application_name == "") {
-		$application_name = $a->getHostName();
+		$application_name = DI::baseUrl()->getHostname();
 	}
 
 	$first_time = ($lastdate == "");
diff --git a/securemail/securemail.php b/securemail/securemail.php
index 5662714b..029e040a 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -13,6 +13,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Util\Emailer;
 
 require_once __DIR__ . '/vendor/autoload.php';
@@ -92,7 +93,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->getHostName();
+			$hostname = DI::baseUrl()->getHostname();
 			if (strpos($hostname, ':')) {
 				$hostname = substr($hostname, 0, strpos($hostname, ':'));
 			}
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index baba236a..38b9f8ab 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -838,7 +838,7 @@ function statusnet_fetchtimeline(App $a, $uid)
 		$application_name = Config::get('statusnet', 'application_name');
 	}
 	if ($application_name == "") {
-		$application_name = $a->getHostName();
+		$application_name = DI::baseUrl()->getHostname();
 	}
 
 	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 54d90948..cfa7bfdc 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -940,7 +940,7 @@ function twitter_fetchtimeline(App $a, $uid)
 	$application_name = Config::get('twitter', 'application_name');
 
 	if ($application_name == "") {
-		$application_name = $a->getHostName();
+		$application_name = DI::baseUrl()->getHostname();
 	}
 
 	$has_picture = false;
@@ -1633,7 +1633,7 @@ function twitter_fetchhometimeline(App $a, $uid)
 	$application_name = Config::get('twitter', 'application_name');
 
 	if ($application_name == "") {
-		$application_name = $a->getHostName();
+		$application_name = DI::baseUrl()->getHostname();
 	}
 
 	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index f596a679..cbb770f6 100644
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -13,6 +13,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Util\Strings;
 
 function xmpp_install()
@@ -167,7 +168,7 @@ function xmpp_converse(App $a)
 			PConfig::set(local_user(), "xmpp", "password", $password);
 		}
 
-		$jid = $a->user["nickname"] . "@" . $a->getHostName() . "/converse-" . Strings::getRandomHex(5);
+		$jid = $a->user["nickname"] . "@" . DI::baseUrl()->getHostname() . "/converse-" . Strings::getRandomHex(5);
 
 		$auto_login = "auto_login: true,
 			authentication: 'login',