diff --git a/dav/common/calendar.fnk.php b/dav/common/calendar.fnk.php
index 1245ee2e..ef1a9b0c 100644
--- a/dav/common/calendar.fnk.php
+++ b/dav/common/calendar.fnk.php
@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 define("DAV_ACL_READ", "{DAV:}read");
 define("DAV_ACL_WRITE", "{DAV:}write");
@@ -151,7 +151,7 @@ function vcard_source_compile($vcardsource)
  */
 function wdcal_php2MySqlTime($phpDate)
 {
-	return date(Temporal::MYSQL, $phpDate);
+	return date(DateTimeFormat::MYSQL, $phpDate);
 }
 
 /**
@@ -160,7 +160,7 @@ function wdcal_php2MySqlTime($phpDate)
  */
 function wdcal_mySql2PhpTime($sqlDate)
 {
-	$ts = DateTime::createFromFormat(Temporal::MYSQL, $sqlDate);
+	$ts = DateTime::createFromFormat(DateTimeFormat::MYSQL, $sqlDate);
 	return $ts->format("U");
 }
 
diff --git a/dav/common/calendar_rendering.fnk.php b/dav/common/calendar_rendering.fnk.php
index ae6e39dd..bc13ce39 100644
--- a/dav/common/calendar_rendering.fnk.php
+++ b/dav/common/calendar_rendering.fnk.php
@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 
 /**
@@ -110,15 +110,15 @@ function renderCalDavEntry_data(&$calendar, &$calendarobject)
 
 		q("INSERT INTO %s%sjqcalendar (`calendar_id`, `calendarobject_id`, `Summary`, `StartTime`, `EndTime`, `IsEditable`, `IsAllDayEvent`, `IsRecurring`, `Color`) VALUES
 			(%d, %d, '%s', CONVERT_TZ('%s', '$timezoneOffset', @@session.time_zone), CONVERT_TZ('%s', '$timezoneOffset', @@session.time_zone), %d, %d, %d, '%s')",
-			CALDAV_SQL_DB, CALDAV_SQL_PREFIX, IntVal($calendar["id"]), IntVal($calendarobject["id"]), dbesc($event["summary"]), date(Temporal::MYSQL, $start),
-			date(Temporal::MYSQL, $last_end), 1, $allday, $recurring, dbesc(substr($event["color"], 1))
+			CALDAV_SQL_DB, CALDAV_SQL_PREFIX, IntVal($calendar["id"]), IntVal($calendarobject["id"]), dbesc($event["summary"]), date(DateTimeFormat::MYSQL, $start),
+			date(DateTimeFormat::MYSQL, $last_end), 1, $allday, $recurring, dbesc(substr($event["color"], 1))
 		);
 
 		foreach ($alarms as $alarm) {
 			$alarm    = renderCalDavEntry_calcalarm($alarm, $component);
 			$notified = ($alarm->getTimestamp() < time() ? 1 : 0);
 			q("INSERT INTO %s%snotifications (`calendar_id`, `calendarobject_id`, `alert_date`, `notified`) VALUES (%d, %d, CONVERT_TZ('%s', '$timezoneOffset', @@session.time_zone), %d)",
-				CALDAV_SQL_DB, CALDAV_SQL_PREFIX, IntVal($calendar["id"]), IntVal($calendarobject["id"]), $alarm->format(Temporal::MYSQL), $notified
+				CALDAV_SQL_DB, CALDAV_SQL_PREFIX, IntVal($calendar["id"]), IntVal($calendarobject["id"]), $alarm->format(DateTimeFormat::MYSQL), $notified
 			);
 		}
 
diff --git a/dav/common/wdcal_backend.inc.php b/dav/common/wdcal_backend.inc.php
index 5418c90a..d66251f4 100644
--- a/dav/common/wdcal_backend.inc.php
+++ b/dav/common/wdcal_backend.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 use Friendica\Core\L10n;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 /**
  * @param mixed $obj
@@ -101,9 +101,9 @@ function wdcal_print_feed($base_path = "")
 				else $type = Sabre\VObject\Property\DateTime::LOCALTZ;
 
 				$datetime_start = new Sabre\VObject\Property\DateTime("DTSTART");
-				$datetime_start->setDateTime(new DateTime(date(Temporal::MYSQL, IntVal($_REQUEST["CalendarStartTime"]))), $type);
+				$datetime_start->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, IntVal($_REQUEST["CalendarStartTime"]))), $type);
 				$datetime_end = new Sabre\VObject\Property\DateTime("DTEND");
-				$datetime_end->setDateTime(new DateTime(date(Temporal::MYSQL, IntVal($_REQUEST["CalendarEndTime"]))), $type);
+				$datetime_end->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, IntVal($_REQUEST["CalendarEndTime"]))), $type);
 
 				$component->add($datetime_start);
 				$component->add($datetime_end);
@@ -183,9 +183,9 @@ function wdcal_print_feed($base_path = "")
 				else $type = Sabre\VObject\Property\DateTime::LOCALTZ;
 
 				$datetime_start = new Sabre\VObject\Property\DateTime("DTSTART");
-				$datetime_start->setDateTime(new DateTime(date(Temporal::MYSQL, IntVal($_REQUEST["CalendarStartTime"]))), $type);
+				$datetime_start->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, IntVal($_REQUEST["CalendarStartTime"]))), $type);
 				$datetime_end = new Sabre\VObject\Property\DateTime("DTEND");
-				$datetime_end->setDateTime(new DateTime(date(Temporal::MYSQL, IntVal($_REQUEST["CalendarEndTime"]))), $type);
+				$datetime_end->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, IntVal($_REQUEST["CalendarEndTime"]))), $type);
 
 				$component->__unset("DTSTART");
 				$component->__unset("DTEND");
diff --git a/dav/common/wdcal_edit.inc.php b/dav/common/wdcal_edit.inc.php
index 8154a68b..49cc1523 100644
--- a/dav/common/wdcal_edit.inc.php
+++ b/dav/common/wdcal_edit.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 use Friendica\Core\L10n;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 /**
  * @param wdcal_local $localization
@@ -521,9 +521,9 @@ function wdcal_set_component_date(&$component, &$localization)
 		$type     = Sabre\VObject\Property\DateTime::LOCALTZ;
 	}
 	$datetime_start = new Sabre\VObject\Property\DateTime("DTSTART");
-	$datetime_start->setDateTime(new DateTime(date(Temporal::MYSQL, $ts_start)), $type);
+	$datetime_start->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, $ts_start)), $type);
 	$datetime_end = new Sabre\VObject\Property\DateTime("DTEND");
-	$datetime_end->setDateTime(new DateTime(date(Temporal::MYSQL, $ts_end)), $type);
+	$datetime_end->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, $ts_end)), $type);
 
 	$component->__unset("DTSTART");
 	$component->__unset("DTEND");
@@ -599,7 +599,7 @@ function wdcal_set_component_recurrence(&$component, &$localization)
 			$date           = $localization->date_local2timestamp($_REQUEST["rec_until_date"]);
 			$part_until     = ";UNTIL=" . date("Ymd", $date);
 			$datetime_until = new Sabre\VObject\Property\DateTime("UNTIL");
-			$datetime_until->setDateTime(new DateTime(date(Temporal::MYSQL, $date)), Sabre\VObject\Property\DateTime::DATE);
+			$datetime_until->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, $date)), Sabre\VObject\Property\DateTime::DATE);
 			break;
 		case "count":
 			$part_until = ";COUNT=" . IntVal($_REQUEST["rec_until_count"]);
@@ -646,7 +646,7 @@ function wdcal_set_component_recurrence(&$component, &$localization)
 	if (isset($_REQUEST["rec_exceptions"])) {
 		$arr = array();
 		foreach ($_REQUEST["rec_exceptions"] as $except) {
-			$arr[] = new DateTime(date(Temporal::MYSQL, $except));
+			$arr[] = new DateTime(date(DateTimeFormat::MYSQL, $except));
 		}
 		/** @var Sabre\VObject\Property\MultiDateTime $prop */
 		$prop = Sabre\VObject\Property::create("EXDATE");
diff --git a/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php b/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php
index 092dbbd8..b02b9150 100644
--- a/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php
+++ b/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 use Friendica\Core\L10n;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 class Sabre_CalDAV_Backend_Friendica extends Sabre_CalDAV_Backend_Virtual
 {
@@ -68,8 +68,8 @@ class Sabre_CalDAV_Backend_Friendica extends Sabre_CalDAV_Backend_Virtual
 			$component = dav_get_eventComponent($vevent);
 
 			if ($row["adjust"]) {
-				$start  = Temporal::local($row["start"]);
-				$finish = Temporal::local($row["finish"]);
+				$start  = DateTimeFormat::local($row["start"]);
+				$finish = DateTimeFormat::local($row["finish"]);
 			} else {
 				$start  = $row["start"];
 				$finish = $row["finish"];
@@ -88,9 +88,9 @@ class Sabre_CalDAV_Backend_Friendica extends Sabre_CalDAV_Backend_Virtual
 			$type           = ($allday ? Sabre\VObject\Property\DateTime::DATE : Sabre\VObject\Property\DateTime::LOCALTZ);
 
 			$datetime_start = new Sabre\VObject\Property\DateTime("DTSTART");
-			$datetime_start->setDateTime(new DateTime(date(Temporal::MYSQL, $ts_start)), $type);
+			$datetime_start->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, $ts_start)), $type);
 			$datetime_end = new Sabre\VObject\Property\DateTime("DTEND");
-			$datetime_end->setDateTime(new DateTime(date(Temporal::MYSQL, $ts_end)), $type);
+			$datetime_end->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, $ts_end)), $type);
 
 			$component->add($datetime_start);
 			$component->add($datetime_end);
@@ -116,8 +116,8 @@ class Sabre_CalDAV_Backend_Friendica extends Sabre_CalDAV_Backend_Virtual
 	private function jqcal2wdcal($row, $calendar, $base_path)
 	{
 		if ($row["adjust"]) {
-			$start  = Temporal::local($row["start"]);
-			$finish = Temporal::local($row["finish"]);
+			$start  = DateTimeFormat::local($row["start"]);
+			$finish = DateTimeFormat::local($row["finish"]);
 		} else {
 			$start  = $row["start"];
 			$finish = $row["finish"];
@@ -175,11 +175,11 @@ class Sabre_CalDAV_Backend_Friendica extends Sabre_CalDAV_Backend_Virtual
 		}
 
 		if ($date_from != "") {
-			if (is_numeric($date_from)) $sql_where .= " AND `finish` >= '" . date(Temporal::MYSQL, $date_from) . "'";
+			if (is_numeric($date_from)) $sql_where .= " AND `finish` >= '" . date(DateTimeFormat::MYSQL, $date_from) . "'";
 			else $sql_where .= " AND `finish` >= '" . dbesc($date_from) . "'";
 		}
 		if ($date_to != "") {
-			if (is_numeric($date_to)) $sql_where .= " AND `start` <= '" . date(Temporal::MYSQL, $date_to) . "'";
+			if (is_numeric($date_to)) $sql_where .= " AND `start` <= '" . date(DateTimeFormat::MYSQL, $date_to) . "'";
 			else $sql_where .= " AND `start` <= '" . dbesc($date_to) . "'";
 		}
 		$ret = [];
diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 3730aa2b..fe4a53ef 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -187,7 +187,7 @@ function dwpost_send(&$a,&$b) {
 		$post = xmlify($post);
 		$tags = dwpost_get_tags($b['tag']);
 
-		$date = Temporal::convert($b['created'], $tz);
+		$date = DateTimeFormat::convert($b['created'], $tz);
 		$year = intval(substr($date,0,4));
 		$mon  = intval(substr($date,5,2));
 		$day  = intval(substr($date,8,2));
diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index a65be286..b8d9511a 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -14,8 +14,8 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Object\Image;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 
 require_once 'mod/share.php';
 require_once 'mod/parse_url.php';
@@ -520,12 +520,12 @@ function fromgplus_fetch($a, $uid) {
 						if (function_exists("share_header"))
 							$post .= share_header($item->object->actor->displayName, $item->object->actor->url,
 										$item->object->actor->image->url, "",
-										Temporal::utc($item->object->published),$item->object->url);
+										DateTimeFormat::utc($item->object->published),$item->object->url);
 						else
 							$post .= "[share author='".str_replace("'", "&#039;",$item->object->actor->displayName).
 									"' profile='".$item->object->actor->url.
 									"' avatar='".$item->object->actor->image->url.
-									"' posted='".Temporal::utc($item->object->published).
+									"' posted='".DateTimeFormat::utc($item->object->published).
 									"' link='".$item->object->url."']";
 
 						$post .= fromgplus_html2bbcode($item->object->content);
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 3c4e917d..ffafa5ee 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -186,7 +186,7 @@ function ijpost_send(&$a,&$b) {
 		$post = xmlify($post);
 		$tags = ijpost_get_tags($b['tag']);
 
-		$date = Temporal::convert($b['created'], $tz);
+		$date = DateTimeFormat::convert($b['created'], $tz);
 		$year = intval(substr($date,0,4));
 		$mon  = intval(substr($date,5,2));
 		$day  = intval(substr($date,8,2));
diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index ff89e5e6..2a14172f 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -187,7 +187,7 @@ function ljpost_send(&$a,&$b) {
 		$post = xmlify($post);
 		$tags = ljpost_get_tags($b['tag']);
 
-		$date = Temporal::convert($b['created'], $tz);
+		$date = DateTimeFormat::convert($b['created'], $tz);
 		$year = intval(substr($date,0,4));
 		$mon  = intval(substr($date,5,2));
 		$day  = intval(substr($date,8,2));
diff --git a/membersince/membersince.php b/membersince/membersince.php
index fb923bde..c1d38b83 100644
--- a/membersince/membersince.php
+++ b/membersince/membersince.php
@@ -9,7 +9,7 @@
 
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 require_once 'include/datetime.php';
 
@@ -26,8 +26,8 @@ function membersince_uninstall()
 function membersince_display(&$a, &$b)
 {
 	// Works in Vier
-	$b = preg_replace('/<\/dl>/', "</dl>\n\n\n<dl id=\"aprofile-membersince\" class=\"aprofile\">\n<dt>" . L10n::t('Member since:') . "</dt>\n<dd>" . Temporal::local($a->profile['register_date']) . "</dd>\n</dl>", $b, 1);
+	$b = preg_replace('/<\/dl>/', "</dl>\n\n\n<dl id=\"aprofile-membersince\" class=\"aprofile\">\n<dt>" . L10n::t('Member since:') . "</dt>\n<dd>" . DateTimeFormat::local($a->profile['register_date']) . "</dd>\n</dl>", $b, 1);
 
 	// Trying for Frio
-	//$b = preg_replace('/<\/div>/', "<div id=\"aprofile-membersince\" class=\"aprofile\"><hr class=\"profile-separator\"><div class=\"profile-label-name\">" . L10n::t('Member since:') . "</div><div class=\"profile-entry\">" . Temporal::local($a->profile['register_date']) . "</div></div>", $b, 1);
+	//$b = preg_replace('/<\/div>/', "<div id=\"aprofile-membersince\" class=\"aprofile\"><hr class=\"profile-separator\"><div class=\"profile-label-name\">" . L10n::t('Member since:') . "</div><div class=\"profile-entry\">" . DateTimeFormat::local($a->profile['register_date']) . "</div></div>", $b, 1);
 }
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 29cf0f60..a5c4cec7 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -10,7 +10,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Model\User;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 function public_server_install() {
 
@@ -39,7 +39,7 @@ function public_server_register_account($a,$b) {
 		return;
 
 	$r = q("UPDATE user set account_expires_on = '%s', expire = %d where uid = %d",
-		dbesc(Temporal::utc('now +' . $days . ' days')),
+		dbesc(DateTimeFormat::utc('now +' . $days . ' days')),
 		intval($days_posts),
 		intval($uid)
 	);
@@ -69,7 +69,7 @@ function public_server_cron($a,$b) {
 			]);
 
 			q("update user set expire_notification_sent = '%s' where uid = %d",
-				dbesc(Temporal::utcNow()),
+				dbesc(DateTimeFormat::utcNow()),
 				intval($rr['uid'])
 			);
 		}
@@ -87,7 +87,7 @@ function public_server_cron($a,$b) {
 		if(count($r)) {
 			foreach($r as $rr)
 				q("update user set account_expires_on = '%s' where uid = %d",
-					dbesc(Temporal::utc('now +' . '6 days')),
+					dbesc(DateTimeFormat::utc('now +' . '6 days')),
 					intval($rr['uid'])
 			);
 		}
@@ -100,7 +100,7 @@ function public_server_cron($a,$b) {
 		if(count($r)) {
 			foreach($r as $rr)
 				q("update user set account_expires_on = '%s' where uid = %d",
-					dbesc(Temporal::utc('now +' . '6 days')),
+					dbesc(DateTimeFormat::utc('now +' . '6 days')),
 					intval($rr['uid'])
 				);
 		}
@@ -138,7 +138,7 @@ function public_server_login($a,$b) {
 	if(! $days)
 		return;
 	$r = q("UPDATE user set account_expires_on = '%s' where uid = %d and account_expires_on > '0000-00-00 00:00:00'",
-	dbesc(Temporal::utc('now +' . $days . ' days')),
+	dbesc(DateTimeFormat::utc('now +' . $days . ' days')),
 	local_user()
 	);
 }
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 45dd5749..1e416f47 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -18,7 +18,7 @@ use Friendica\Model\Item;
 use Friendica\Model\Queue;
 use Friendica\Util\Network;
 use Friendica\Model\User;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 require 'addon/pumpio/oauth/http.php';
 require 'addon/pumpio/oauth/oauth_client.php';
@@ -672,7 +672,7 @@ function pumpio_sync(&$a) {
 	if ($abandon_days < 1)
 		$abandon_days = 0;
 
-	$abandon_limit = date(Temporal::MYSQL, time() - $abandon_days * 86400);
+	$abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400);
 
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'pumpio' AND `k` = 'import' AND `v` = '1' ORDER BY RAND() ");
 	if(count($r)) {
@@ -871,7 +871,7 @@ function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) {
 	}
 
 	$r = q("UPDATE `item` SET `deleted` = 1, `unseen` = 1, `changed` = '%s' WHERE `verb` = '%s' AND `uid` = %d AND `contact-id` = %d AND `thr-parent` = '%s'",
-		dbesc(Temporal::utcNow()),
+		dbesc(DateTimeFormat::utcNow()),
 		dbesc(ACTIVITY_LIKE),
 		intval($uid),
 		intval($contactid),
@@ -1002,7 +1002,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) {
 					`location`, `about`, `writable`, `blocked`, `readonly`, `pending` )
 				VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)",
 			intval($uid),
-			dbesc(Temporal::utcNow()),
+			dbesc(DateTimeFormat::utcNow()),
 			dbesc($contact->url),
 			dbesc(normalise_link($contact->url)),
 			dbesc(str_replace("acct:", "", $contact->id)),
@@ -1211,11 +1211,11 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 	if ($post->object->displayName != "")
 		$postarray['title'] = $post->object->displayName;
 
-	$postarray['created'] = Temporal::utc($post->published);
+	$postarray['created'] = DateTimeFormat::utc($post->published);
 	if (isset($post->updated))
-		$postarray['edited'] = Temporal::utc($post->updated);
+		$postarray['edited'] = DateTimeFormat::utc($post->updated);
 	elseif (isset($post->received))
-		$postarray['edited'] = Temporal::utc($post->received);
+		$postarray['edited'] = DateTimeFormat::utc($post->received);
 	else
 		$postarray['edited'] = $postarray['created'];
 
@@ -1230,7 +1230,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 
 			$postarray['body'] = share_header($share_author, $post->object->author->url,
 							$post->object->author->image->url, "",
-							Temporal::utc($post->object->created),
+							DateTimeFormat::utc($post->object->created),
 							$post->links->self->href).
 						$postarray['body']."[/share]";
 
@@ -1238,7 +1238,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 			$postarray['body'] = "[share author='".$share_author.
 					"' profile='".$post->object->author->url.
 					"' avatar='".$post->object->author->image->url.
-					"' posted='".Temporal::convert($post->object->created, 'UTC', 'UTC', ).
+					"' posted='".DateTimeFormat::convert($post->object->created, 'UTC', 'UTC', ).
 					"' link='".$post->links->self->href."']".$postarray['body']."[/share]";
 			*/
 		} else {
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index ae54e2fd..22e8f5f9 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -53,8 +53,8 @@ use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 
 function statusnet_install()
 {
@@ -760,7 +760,7 @@ function statusnet_cron(App $a, $b)
 		$abandon_days = 0;
 	}
 
-	$abandon_limit = date(Temporal::MYSQL, time() - $abandon_days * 86400);
+	$abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400);
 
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'import' AND `v` ORDER BY RAND()");
 	if (count($r)) {
@@ -936,7 +936,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
 					`location`, `about`, `writable`, `blocked`, `readonly`, `pending` )
 					VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0 ) ",
 			intval($uid),
-			dbesc(Temporal::utcNow()),
+			dbesc(DateTimeFormat::utcNow()),
 			dbesc($contact->statusnet_profile_url),
 			dbesc(normalise_link($contact->statusnet_profile_url)),
 			dbesc(statusnet_address($contact)),
@@ -977,13 +977,13 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
 			dbesc($photos[0]),
 			dbesc($photos[1]),
 			dbesc($photos[2]),
-			dbesc(Temporal::utcNow()),
+			dbesc(DateTimeFormat::utcNow()),
 			intval($contact_id)
 		);
 	} else {
 		// update profile photos once every two weeks as we have no notification of when they change.
-		//$update_photo = (($r[0]['avatar-date'] < Temporal::convert('now -2 days', '', '', )) ? true : false);
-		$update_photo = ($r[0]['avatar-date'] < Temporal::utc('now -12 hours'));
+		//$update_photo = (($r[0]['avatar-date'] < DateTimeFormat::convert('now -2 days', '', '', )) ? true : false);
+		$update_photo = ($r[0]['avatar-date'] < DateTimeFormat::utc('now -12 hours'));
 
 		// check that we have all the photos, this has been known to fail on occasion
 		if ((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
@@ -1008,9 +1008,9 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
 				dbesc($photos[0]),
 				dbesc($photos[1]),
 				dbesc($photos[2]),
-				dbesc(Temporal::utcNow()),
-				dbesc(Temporal::utcNow()),
-				dbesc(Temporal::utcNow()),
+				dbesc(DateTimeFormat::utcNow()),
+				dbesc(DateTimeFormat::utcNow()),
+				dbesc(DateTimeFormat::utcNow()),
 				dbesc($contact->statusnet_profile_url),
 				dbesc(normalise_link($contact->statusnet_profile_url)),
 				dbesc(statusnet_address($contact)),
@@ -1197,8 +1197,8 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
 	$postarray['body'] = $converted["body"];
 	$postarray['tag'] = $converted["tags"];
 
-	$postarray['created'] = Temporal::utc($content->created_at);
-	$postarray['edited'] = Temporal::utc($content->created_at);
+	$postarray['created'] = DateTimeFormat::utc($content->created_at);
+	$postarray['edited'] = DateTimeFormat::utc($content->created_at);
 
 	if (is_string($content->place->name)) {
 		$postarray["location"] = $content->place->name;
diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 4f434123..5c3930cd 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -10,7 +10,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Model\User;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 function testdrive_install() {
 
@@ -44,7 +44,7 @@ function testdrive_register_account($a,$b) {
 		return;
 
 	$r = q("UPDATE user set account_expires_on = '%s' where uid = %d",
-		dbesc(Temporal::convert('now +' . $days . ' days')),
+		dbesc(DateTimeFormat::convert('now +' . $days . ' days')),
 		intval($uid)
 	);
 
@@ -72,7 +72,7 @@ function testdrive_cron($a,$b) {
 			]);
 
 			q("update user set expire_notification_sent = '%s' where uid = %d",
-				dbesc(Temporal::utcNow()),
+				dbesc(DateTimeFormat::utcNow()),
 				intval($rr['uid'])
 			);
 
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 0bffa4eb..bf85f081 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -77,8 +77,8 @@ use Friendica\Model\Photo;
 use Friendica\Model\Queue;
 use Friendica\Model\User;
 use Friendica\Object\Image;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -682,7 +682,7 @@ function twitter_cron(App $a, $b)
 		$abandon_days = 0;
 	}
 
-	$abandon_limit = date(Temporal::MYSQL, time() - $abandon_days * 86400);
+	$abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400);
 
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1'");
 	if (count($r)) {
@@ -1017,7 +1017,7 @@ function twitter_fetch_contact($uid, $contact, $create_user)
 					`location`, `about`, `writable`, `blocked`, `readonly`, `pending`)
 					VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)",
 			intval($uid),
-			dbesc(Temporal::utcNow()),
+			dbesc(DateTimeFormat::utcNow()),
 			dbesc("https://twitter.com/" . $contact->screen_name),
 			dbesc(normalise_link("https://twitter.com/" . $contact->screen_name)),
 			dbesc($contact->screen_name."@twitter.com"),
@@ -1061,16 +1061,16 @@ function twitter_fetch_contact($uid, $contact, $create_user)
 				dbesc($photos[0]),
 				dbesc($photos[1]),
 				dbesc($photos[2]),
-				dbesc(Temporal::utcNow()),
-				dbesc(Temporal::utcNow()),
-				dbesc(Temporal::utcNow()),
+				dbesc(DateTimeFormat::utcNow()),
+				dbesc(DateTimeFormat::utcNow()),
+				dbesc(DateTimeFormat::utcNow()),
 				intval($contact_id)
 			);
 		}
 	} else {
 		// update profile photos once every two weeks as we have no notification of when they change.
-		//$update_photo = (($r[0]['avatar-date'] < Temporal::convert('now -2 days', '', '', )) ? true : false);
-		$update_photo = ($r[0]['avatar-date'] < Temporal::utc('now -12 hours'));
+		//$update_photo = (($r[0]['avatar-date'] < DateTimeFormat::convert('now -2 days', '', '', )) ? true : false);
+		$update_photo = ($r[0]['avatar-date'] < DateTimeFormat::utc('now -12 hours'));
 
 		// check that we have all the photos, this has been known to fail on occasion
 		if ((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
@@ -1096,9 +1096,9 @@ function twitter_fetch_contact($uid, $contact, $create_user)
 					dbesc($photos[0]),
 					dbesc($photos[1]),
 					dbesc($photos[2]),
-					dbesc(Temporal::utcNow()),
-					dbesc(Temporal::utcNow()),
-					dbesc(Temporal::utcNow()),
+					dbesc(DateTimeFormat::utcNow()),
+					dbesc(DateTimeFormat::utcNow()),
+					dbesc(DateTimeFormat::utcNow()),
 					dbesc("https://twitter.com/".$contact->screen_name),
 					dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
 					dbesc($contact->screen_name."@twitter.com"),
@@ -1490,8 +1490,8 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
 	$converted = twitter_expand_entities($a, $postarray['body'], $post, false, $picture);
 	$postarray['body'] = $converted["body"];
 	$postarray['tag'] = $converted["tags"];
-	$postarray['created'] = Temporal::utc($post->created_at);
-	$postarray['edited'] = Temporal::utc($post->created_at);
+	$postarray['created'] = DateTimeFormat::utc($post->created_at);
+	$postarray['edited'] = DateTimeFormat::utc($post->created_at);
 
 	$statustext = $converted["plain"];