diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 7d7c3e1ae4..f971d462b2 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -3,7 +3,7 @@
  * @file include/acl_selectors.php
  */
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
 use Friendica\Model\GlobalContact;
diff --git a/include/api.php b/include/api.php
index 320a00d50f..ea804b18ba 100644
--- a/include/api.php
+++ b/include/api.php
@@ -6,7 +6,7 @@
  * @todo Automatically detect if incoming data is HTML or BBCode
  */
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\NotificationsManager;
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 0c5244579e..31e57ea839 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -2,7 +2,7 @@
 /**
  * @file include/contact_widgets.php
  */
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
diff --git a/include/conversation.php b/include/conversation.php
index 1fea1219ec..4b9459a3f7 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -3,7 +3,7 @@
  * @file include/conversation.php
  */
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
diff --git a/include/event.php b/include/event.php
index ce974bd502..4795867b12 100644
--- a/include/event.php
+++ b/include/event.php
@@ -5,7 +5,7 @@
  */
 
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
diff --git a/include/identity.php b/include/identity.php
index 68b6b4be11..a3a007cc18 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -4,7 +4,7 @@
  */
 
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Content\ForumManager;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
diff --git a/include/items.php b/include/items.php
index 3e502aac51..cbc7af5655 100644
--- a/include/items.php
+++ b/include/items.php
@@ -4,7 +4,7 @@
  */
 use Friendica\App;
 use Friendica\ParseUrl;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
diff --git a/include/nav.php b/include/nav.php
index 60b8cb66c1..f2bf161f9e 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -3,7 +3,7 @@
  * @file include/nav.php
  */
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
diff --git a/include/tags.php b/include/tags.php
index 55168b6243..45a17f9c96 100644
--- a/include/tags.php
+++ b/include/tags.php
@@ -3,7 +3,7 @@
  * @file include/tags.php
  */
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Object\Contact;
diff --git a/include/text.php b/include/text.php
index f5a47c9a96..b2e0ac30d4 100644
--- a/include/text.php
+++ b/include/text.php
@@ -3,7 +3,7 @@
  * @file include/text.php
  */
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Content\Smilies;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
diff --git a/mod/admin.php b/mod/admin.php
index 2e5ba8ba7c..29e10bda83 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -5,7 +5,7 @@
  * @brief Friendica admin
  */
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
diff --git a/mod/cal.php b/mod/cal.php
index 633fe54084..7eb31905b8 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -6,7 +6,7 @@
  *	of the profile owner
  */
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
diff --git a/mod/editpost.php b/mod/editpost.php
index a2e58239ab..a9cdfe9bbb 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -3,7 +3,7 @@
  * @file mod/editpost.php
  */
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
diff --git a/mod/network.php b/mod/network.php
index a320fafd3d..7e61d083f6 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -3,7 +3,7 @@
  * @file mod/network.php
  */
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Content\ForumManager;
 use Friendica\Core\System;
 use Friendica\Core\Config;
diff --git a/mod/photos.php b/mod/photos.php
index 47227a1cee..3e2c44e3cd 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -3,7 +3,7 @@
  * @file mod/photos.php
  */
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
diff --git a/mod/ping.php b/mod/ping.php
index 3a5959c525..0f2a9584b8 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -3,7 +3,7 @@
  * @file include/ping.php
  */
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Content\ForumManager;
 use Friendica\Core\Cache;
 use Friendica\Core\System;
diff --git a/mod/profiles.php b/mod/profiles.php
index 7d8d0c3d14..eca13bf10c 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -3,7 +3,7 @@
  * @file mod/profiles.php
  */
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
diff --git a/mod/search.php b/mod/search.php
index 900b9cba59..c17b11c5d9 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -3,7 +3,7 @@
  * @file mod/search.php
  */
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
diff --git a/mod/settings.php b/mod/settings.php
index 1fde749d86..778a1d8a77 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -3,7 +3,7 @@
  * @file mod/settings.php
  */
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Core\Config;
diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index fb64aed6f4..d619db42b2 100644
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -6,7 +6,7 @@
 namespace Friendica\Content;
 
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use dba;
diff --git a/src/Object/Item.php b/src/Object/Item.php
index 5979821653..1533908aeb 100644
--- a/src/Object/Item.php
+++ b/src/Object/Item.php
@@ -5,7 +5,7 @@
 namespace Friendica\Object;
 
 use Friendica\BaseObject;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;