diff --git a/include/Forum.php b/include/ForumManager.php
similarity index 99%
rename from include/Forum.php
rename to include/ForumManager.php
index 847affa875..49417d1831 100644
--- a/include/Forum.php
+++ b/include/ForumManager.php
@@ -8,7 +8,7 @@
 /**
  * @brief This class handles functions related to the forum functionality
  */
-class Forum {
+class ForumManager {
 
 	/**
 	 * @brief Function to list all forums a user is connected with
diff --git a/include/identity.php b/include/identity.php
index a6932f0911..ec66225d0f 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -3,7 +3,7 @@
  * @file include/identity.php
  */
 
-require_once('include/Forum.php');
+require_once('include/ForumManager.php');
 require_once('include/bbcode.php');
 require_once("mod/proxy.php");
 
@@ -655,7 +655,7 @@ function advanced_profile(&$a) {
 	
 		//show subcribed forum if it is enabled in the usersettings
 		if (feature_enabled($uid,'forumlist_profile')) {
-			$profile['forumlist'] = array( t('Forums:'), Forum::profile_advanced($uid));
+			$profile['forumlist'] = array( t('Forums:'), ForumManager::profile_advanced($uid));
 		}
 
 		if ($a->profile['uid'] == local_user())
diff --git a/mod/network.php b/mod/network.php
index b72d72d78f..0010a3d824 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -114,7 +114,7 @@ function network_init(&$a) {
 	require_once('include/group.php');
 	require_once('include/contact_widgets.php');
 	require_once('include/items.php');
-	require_once('include/Forum.php');
+	require_once('include/ForumManager.php');
 
 	if(! x($a->page,'aside'))
 		$a->page['aside'] = '';
@@ -148,7 +148,7 @@ function network_init(&$a) {
 	}
 
 	$a->page['aside'] .= (feature_enabled(local_user(),'groups') ? group_side('network/0','network','standard',$group_id) : '');
-	$a->page['aside'] .= (feature_enabled(local_user(),'forumlist_widget') ? Forum::widget(local_user(),$cid) : '');
+	$a->page['aside'] .= (feature_enabled(local_user(),'forumlist_widget') ? ForumManager::widget(local_user(),$cid) : '');
 	$a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false);
 	$a->page['aside'] .= networks_widget($a->get_baseurl(true) . '/network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
 	$a->page['aside'] .= saved_searches($search);
diff --git a/mod/ping.php b/mod/ping.php
index 2abad13b0b..577a2c6c82 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,7 +1,7 @@
 <?php
 require_once("include/datetime.php");
 require_once('include/bbcode.php');
-require_once('include/Forum.php');
+require_once('include/ForumManager.php');
 require_once('include/group.php');
 require_once("mod/proxy.php");
 
@@ -96,7 +96,7 @@ function ping_init(&$a) {
 			}
 
 			if(intval(feature_enabled(local_user(),'forumlist_widget'))) {
-				$forums_unseen = Forum::count_unseen_items();
+				$forums_unseen = ForumManager::count_unseen_items();
 			}
 		}
 
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index cd2c31f188..c2669f5a93 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -220,7 +220,7 @@ function vier_community_info() {
 	//Community_Pages at right_aside
 	if($show_pages AND local_user()) {
 
-		require_once('include/Forum.php');
+		require_once('include/ForumManager.php');
 
 		if(x($_GET['cid']) && intval($_GET['cid']) != 0)
 			$cid = $_GET['cid'];
@@ -228,7 +228,7 @@ function vier_community_info() {
 		//sort by last updated item
 		$lastitem = true;
 
-		$contacts = Forum::get_list($a->user['uid'],true,$lastitem, true);
+		$contacts = ForumManager::get_list($a->user['uid'],true,$lastitem, true);
 		$total = count($contacts);
 		$visible_forums = 10;