diff --git a/gnot/gnot.php b/gnot/gnot.php
index 8420ffe49..ca32d6d5e 100644
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -7,11 +7,12 @@
  * 
  *
  */
+
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Model\Notify\Type;
+use Friendica\Model\Notification;
 
 function gnot_install() {
 
@@ -79,6 +80,6 @@ function gnot_settings(&$a,&$s) {
 function gnot_enotify_mail(&$a,&$b) {
 	if((! $b['uid']) || (! intval(DI::pConfig()->get($b['uid'], 'gnot','enable'))))
 		return;
-	if($b['type'] == Type::COMMENT)
+	if($b['type'] == Notification\Type::COMMENT)
 		$b['subject'] = DI::l10n()->t('[Friendica:Notify] Comment to conversation #%d', $b['parent']);
 }
diff --git a/public_server/public_server.php b/public_server/public_server.php
index bb7ebec94..472a442f9 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -13,7 +13,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Notify\Type;
+use Friendica\Model\Notification;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
@@ -58,7 +58,7 @@ function public_server_cron($a, $b)
 	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
 			notification([
-				'type' => Type::SYSTEM,
+				'type' => Notification/Type::SYSTEM,
 				'uid' => $rr['uid'],
 				'system_type' => 'public_server_expire',
 				'source_name'  => DI::l10n()->t('Administrator'),
diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index f0d29e0e0..e0e0fb57b 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -11,7 +11,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Search;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Notify\Type;
+use Friendica\Model\Notification;
 use Friendica\Model\User;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
@@ -58,7 +58,7 @@ function testdrive_cron($a,$b) {
 	if(count($r)) {
 		foreach($r as $rr) {
 			notification([
-				'type' => Type::SYSTEM,
+				'type' => Notification/Type::SYSTEM,
 				'uid' => $rr['uid'],
 				'system_type' => 'testdrive_expire',
 				'source_name'  => DI::l10n()->t('Administrator'),