diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index d0151648f..e0de2db4f 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -189,7 +189,7 @@ if(isset($_POST['updateprefs']))
 	}
 }
 
-if (plugInstalled('alt_auth'))
+if (e107::isInstalled('alt_auth'))
 {
 	$authlist[] = "e107";
 	$handle = opendir(e_PLUGIN."alt_auth");
diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php
index 3785497be..b2fad3591 100644
--- a/e107_admin/update_routines.php
+++ b/e107_admin/update_routines.php
@@ -1006,7 +1006,7 @@ function update_706_to_800($type='')
 	// Plugin tables whose definition needs changing significantly
 	foreach ($pluginChangedTables as $plugName => $plugList)
 	{
-		if (plugInstalled($plugName))
+		if (e107::isInstalled($plugName))
 		{
 			$ttc = explode(',',$plugList);
 			foreach ($ttc as $ct)
diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index 1e4b99a06..f7592b493 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -1517,7 +1517,7 @@ class themeHandler
 		{
 			$plug = trim($p['@attributes']['name']);
 			
-			if(plugInstalled($plug))
+			if(e107::isInstalled($plug))
 			{
 				$text .= $plug." ".ADMIN_TRUE_ICON;
 			}
diff --git a/e107_plugins/chatbox_menu/admin_chatbox.php b/e107_plugins/chatbox_menu/admin_chatbox.php
index e9cd37013..c8ad12f5e 100644
--- a/e107_plugins/chatbox_menu/admin_chatbox.php
+++ b/e107_plugins/chatbox_menu/admin_chatbox.php
@@ -12,7 +12,7 @@
 
 require_once("../../class2.php");
 
-if (!plugInstalled('chatbox_menu') || !getperms("P")) 
+if (!e107::isInstalled('chatbox_menu') || !getperms("P")) 
 {
 	header("Location: ".e_BASE."index.php");
 	exit;
diff --git a/e107_plugins/chatbox_menu/chat.php b/e107_plugins/chatbox_menu/chat.php
index 0d8dd8acc..b29d5c57c 100644
--- a/e107_plugins/chatbox_menu/chat.php
+++ b/e107_plugins/chatbox_menu/chat.php
@@ -9,7 +9,7 @@
  */
 
 require_once('../../class2.php');
-if (!plugInstalled('chatbox_menu')) 
+if (!e107::isInstalled('chatbox_menu')) 
 {
 	header('Location: '.e_BASE.'index.php');
 	exit;
diff --git a/e107_plugins/chatbox_menu/chatbox_menu.php b/e107_plugins/chatbox_menu/chatbox_menu.php
index d10f90a85..c7e76895c 100644
--- a/e107_plugins/chatbox_menu/chatbox_menu.php
+++ b/e107_plugins/chatbox_menu/chatbox_menu.php
@@ -30,7 +30,7 @@ $pref = e107::getPref();
 
 
 
-if (!plugInstalled('chatbox_menu')) 
+if (!e107::isInstalled('chatbox_menu')) 
 {
 	return '';
 }
diff --git a/e107_plugins/download/admin_download.php b/e107_plugins/download/admin_download.php
index 17ebbe5b0..f5ff40510 100644
--- a/e107_plugins/download/admin_download.php
+++ b/e107_plugins/download/admin_download.php
@@ -18,7 +18,7 @@ $eplug_admin = true;
 define('DOWNLOAD_DEBUG',FALSE);
 
 require_once("../../class2.php");
-if (!getperms("P") || !plugInstalled('download'))
+if (!getperms("P") || !e107::isInstalled('download'))
 {
 	header("location:".e_BASE."index.php");
 	exit() ;
diff --git a/e107_plugins/faqs/e_sitelink.php b/e107_plugins/faqs/e_sitelink.php
index e10dbc969..df2f64f72 100644
--- a/e107_plugins/faqs/e_sitelink.php
+++ b/e107_plugins/faqs/e_sitelink.php
@@ -16,7 +16,7 @@
 */
 
 if (!defined('e107_INIT')) { exit; }
-/*if(!plugInstalled('gsitemap'))
+/*if(!e107::isInstalled('gsitemap'))
 { 
 	return;
 }*/
diff --git a/e107_plugins/featurebox/admin_config.php b/e107_plugins/featurebox/admin_config.php
index d461ab8e7..b86867c6b 100644
--- a/e107_plugins/featurebox/admin_config.php
+++ b/e107_plugins/featurebox/admin_config.php
@@ -10,7 +10,7 @@
 *
 */
 require_once("../../class2.php");
-if (!getperms("P") || !plugInstalled('featurebox')) 
+if (!getperms("P") || !e107::isInstalled('featurebox')) 
 {
 	header("location:".e_BASE."index.php");
 	 exit;
diff --git a/e107_plugins/forum/forum_viewtopic.php b/e107_plugins/forum/forum_viewtopic.php
index 2e2abfd1e..29356dfd5 100644
--- a/e107_plugins/forum/forum_viewtopic.php
+++ b/e107_plugins/forum/forum_viewtopic.php
@@ -93,7 +93,7 @@ if(isset($_GET['f']))
 
 e107::getScBatch('view', 'forum')->setScVar('thread', $thread);
 
-$pm_installed = plugInstalled('pm');
+$pm_installed = e107::isInstalled('pm');
 
 //Only increment thread views if not being viewed by thread starter
 if (USER && (USERID != $thread->threadInfo['thread_user'] || $thread->threadInfo['thread_total_replies'] > 0) || !$thread->noInc)
diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
index 642c4e6dd..cddaa71b6 100644
--- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
@@ -163,7 +163,7 @@ class plugin_forum_view_shortcodes extends e_shortcode
 
 	function sc_privmessage()
 	{
-		if(plugInstalled('pm') && ($this->postInfo['post_user'] > 0))
+		if(e107::isInstalled('pm') && ($this->postInfo['post_user'] > 0))
 		{
 			return e107::getParser()->parseTemplate("{SENDPM={$this->postInfo['post_user']}}");
 		}
diff --git a/e107_plugins/gallery/admin_gallery.php b/e107_plugins/gallery/admin_gallery.php
index 10022daf3..fcfcd9d4d 100644
--- a/e107_plugins/gallery/admin_gallery.php
+++ b/e107_plugins/gallery/admin_gallery.php
@@ -17,7 +17,7 @@
 $eplug_admin = true;
 
 require_once("../../class2.php");
-if (!getperms("P") || !plugInstalled('gallery'))
+if (!getperms("P") || !e107::isInstalled('gallery'))
 {
 	header("location:".e_BASE."index.php");
 	exit() ;
diff --git a/e107_plugins/gallery/gallery.php b/e107_plugins/gallery/gallery.php
index 43b15ac95..5e095db00 100644
--- a/e107_plugins/gallery/gallery.php
+++ b/e107_plugins/gallery/gallery.php
@@ -23,7 +23,7 @@
  
 
 require_once("../../class2.php");
-if (!plugInstalled('gallery'))
+if (!e107::isInstalled('gallery'))
 {
 	header('location:'.e_BASE.'index.php');
 	exit;
diff --git a/e107_plugins/gsitemap/admin_config.php b/e107_plugins/gsitemap/admin_config.php
index 0dbe12c91..3f4209052 100644
--- a/e107_plugins/gsitemap/admin_config.php
+++ b/e107_plugins/gsitemap/admin_config.php
@@ -10,7 +10,7 @@
  *
 */
 require_once("../../class2.php");
-if(!getperms("P") || !plugInstalled('gsitemap'))
+if(!getperms("P") || !e107::isInstalled('gsitemap'))
 { 
 	header("location:".e_BASE."index.php"); 
 	exit();
@@ -382,7 +382,7 @@ class gsitemap
 
 
 		/* forums ... */
-		if(plugInstalled('forum'))
+		if(e107::isInstalled('forum'))
 		{ 
 			$sql -> select("forum", "*", "forum_parent!='0' ORDER BY forum_order ASC");
 			$nfArray = $sql -> db_getList();
@@ -397,7 +397,7 @@ class gsitemap
 
 
 		/* DEPRECATED content pages ...
-		if(plugInstalled('content'))
+		if(e107::isInstalled('content'))
 		{ 	
 			$sql -> select("pcontent", "content_id, content_heading", "LEFT(content_parent,1) = '0' ORDER BY content_heading");
 			$nfArray = $sql -> db_getList();
diff --git a/e107_plugins/gsitemap/e_module.php b/e107_plugins/gsitemap/e_module.php
index 89c31cffd..a3a4ea282 100644
--- a/e107_plugins/gsitemap/e_module.php
+++ b/e107_plugins/gsitemap/e_module.php
@@ -16,7 +16,7 @@
 */
 
  if (!defined('e107_INIT')) { exit; }
-if(!plugInstalled('gsitemap'))
+if(!e107::isInstalled('gsitemap'))
 { 
 	return '';
 }
diff --git a/e107_plugins/gsitemap/weblog_pinger.php b/e107_plugins/gsitemap/weblog_pinger.php
index 079998c48..71b8d1193 100644
--- a/e107_plugins/gsitemap/weblog_pinger.php
+++ b/e107_plugins/gsitemap/weblog_pinger.php
@@ -38,7 +38,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA. */
 
-if(!plugInstalled('gsitemap'))
+if(!e107::isInstalled('gsitemap'))
 { 
 	header("location:".e_BASE."index.php"); 
 	exit();
diff --git a/e107_plugins/linkwords/e_tohtml.php b/e107_plugins/linkwords/e_tohtml.php
index 4d89da8a0..036f58818 100755
--- a/e107_plugins/linkwords/e_tohtml.php
+++ b/e107_plugins/linkwords/e_tohtml.php
@@ -28,7 +28,7 @@
  */
 
 if (!defined('e107_INIT')) { exit; }
-// if (!plugInstalled('linkwords')) exit; // This will completely break a site during  upgrades. 
+// if (!e107::isInstalled('linkwords')) exit; // This will completely break a site during  upgrades. 
 
 define('LW_CACHE_ENABLE', FALSE);
 
diff --git a/e107_plugins/linkwords/linkwords.php b/e107_plugins/linkwords/linkwords.php
index 08ad91083..ac4fabddb 100644
--- a/e107_plugins/linkwords/linkwords.php
+++ b/e107_plugins/linkwords/linkwords.php
@@ -22,7 +22,7 @@
 */
 
 if (!defined('e107_INIT')) { exit; }
-// if (!plugInstalled('linkwords')) exit; // This will break a site completely under some circumstance. 
+// if (!e107::isInstalled('linkwords')) exit; // This will break a site completely under some circumstance. 
 
 
 class e_linkwords
diff --git a/e107_plugins/list_new/admin_list_config.php b/e107_plugins/list_new/admin_list_config.php
index 203688e62..cf05c7578 100644
--- a/e107_plugins/list_new/admin_list_config.php
+++ b/e107_plugins/list_new/admin_list_config.php
@@ -24,7 +24,7 @@
 
 //include and require several classes
 require_once("../../class2.php");
-if(!getperms("1") || !plugInstalled('list_new'))
+if(!getperms("1") || !e107::isInstalled('list_new'))
 {
 	header("location:".e_BASE."index.php");
 	exit ;
diff --git a/e107_plugins/list_new/list.php b/e107_plugins/list_new/list.php
index 8ad9aca13..933b0569b 100644
--- a/e107_plugins/list_new/list.php
+++ b/e107_plugins/list_new/list.php
@@ -24,7 +24,7 @@
 
 require_once("../../class2.php");
 
-if (!plugInstalled('list_new'))
+if (!e107::isInstalled('list_new'))
 {
 	header("Location: ".e_BASE."index.php");
 	exit;
diff --git a/e107_plugins/list_new/list_class.php b/e107_plugins/list_new/list_class.php
index b06e04ab7..597588798 100644
--- a/e107_plugins/list_new/list_class.php
+++ b/e107_plugins/list_new/list_class.php
@@ -527,7 +527,7 @@ class listclass
 			}
 			else
 			{
-				if (plugInstalled($file))
+				if (e107::isInstalled($file))
 				{
 					if(is_readable(e_PLUGIN.$file."/e_list.php"))
 					{
diff --git a/e107_plugins/list_new/list_new_menu.php b/e107_plugins/list_new/list_new_menu.php
index 36c8b2992..f52172ca6 100644
--- a/e107_plugins/list_new/list_new_menu.php
+++ b/e107_plugins/list_new/list_new_menu.php
@@ -24,7 +24,7 @@
 
 if (!defined('e107_INIT')) { exit; }
 
-if (!plugInstalled('list_new'))
+if (!e107::isInstalled('list_new'))
 {
 	return;
 }
diff --git a/e107_plugins/list_new/list_recent_menu.php b/e107_plugins/list_new/list_recent_menu.php
index 0553d3eda..e92762c39 100644
--- a/e107_plugins/list_new/list_recent_menu.php
+++ b/e107_plugins/list_new/list_recent_menu.php
@@ -24,7 +24,7 @@
 
 if (!defined('e107_INIT')) { exit; }
 
-if (!plugInstalled('list_new'))
+if (!e107::isInstalled('list_new'))
 {
 	return;
 }
diff --git a/e107_plugins/newsfeed/admin_config.php b/e107_plugins/newsfeed/admin_config.php
index 94c3ddf44..71263508e 100644
--- a/e107_plugins/newsfeed/admin_config.php
+++ b/e107_plugins/newsfeed/admin_config.php
@@ -11,7 +11,7 @@
  *
 */
 require_once("../../class2.php");
-if (!getperms("P") || !plugInstalled('newsfeed')) 
+if (!getperms("P") || !e107::isInstalled('newsfeed')) 
 {
 	header("location:".e_BASE."index.php");
 	exit;
diff --git a/e107_plugins/newsfeed/e_frontpage.php b/e107_plugins/newsfeed/e_frontpage.php
index 6726069bc..47cf2edcd 100644
--- a/e107_plugins/newsfeed/e_frontpage.php
+++ b/e107_plugins/newsfeed/e_frontpage.php
@@ -16,7 +16,7 @@
 */
 
 if (!defined('e107_INIT')) { exit; }
-if (!plugInstalled('newsfeed')) 
+if (!e107::isInstalled('newsfeed')) 
 {
 	return;
 }
diff --git a/e107_plugins/newsfeed/e_help.php b/e107_plugins/newsfeed/e_help.php
index 9d7b77f90..b23842692 100644
--- a/e107_plugins/newsfeed/e_help.php
+++ b/e107_plugins/newsfeed/e_help.php
@@ -15,7 +15,7 @@
  *
 */
 if (!defined('e107_INIT')) { exit; }
-if (!plugInstalled('newsfeed')) 
+if (!e107::isInstalled('newsfeed')) 
 {
 	return;
 }
diff --git a/e107_plugins/newsfeed/newsfeed.php b/e107_plugins/newsfeed/newsfeed.php
index d30cb5e08..35f4c4654 100644
--- a/e107_plugins/newsfeed/newsfeed.php
+++ b/e107_plugins/newsfeed/newsfeed.php
@@ -15,7 +15,7 @@
  *
 */
 require_once('../../class2.php');
-if (!plugInstalled('newsfeed')) 
+if (!e107::isInstalled('newsfeed')) 
 {
 	header("location:".e_BASE."index.php");
 	exit;
diff --git a/e107_plugins/newsfeed/newsfeed_functions.php b/e107_plugins/newsfeed/newsfeed_functions.php
index bf3d260ed..5b2fe75ae 100644
--- a/e107_plugins/newsfeed/newsfeed_functions.php
+++ b/e107_plugins/newsfeed/newsfeed_functions.php
@@ -24,7 +24,7 @@ feed refresh time has expired, the cache is updated.
 */
 
 if (!defined('e107_INIT')) { exit; }
-if (!plugInstalled('newsfeed')) 
+if (!e107::isInstalled('newsfeed')) 
 {
 	return;
 }
diff --git a/e107_plugins/newsfeed/newsfeed_menu.php b/e107_plugins/newsfeed/newsfeed_menu.php
index 725bc367d..756273d35 100644
--- a/e107_plugins/newsfeed/newsfeed_menu.php
+++ b/e107_plugins/newsfeed/newsfeed_menu.php
@@ -15,7 +15,7 @@
  *
 */
 if (!defined('e107_INIT')) { exit; }
-if (!plugInstalled('newsfeed')) 
+if (!e107::isInstalled('newsfeed')) 
 {
 	return '';
 }
diff --git a/e107_plugins/poll/admin_config.php b/e107_plugins/poll/admin_config.php
index 4ff91eed8..2a3ce5aaf 100644
--- a/e107_plugins/poll/admin_config.php
+++ b/e107_plugins/poll/admin_config.php
@@ -10,7 +10,7 @@
 
 require_once("../../class2.php");
 if (!is_object($tp)) $tp = new e_parse;
-if (!getperms("P") || !plugInstalled('poll')) 
+if (!getperms("P") || !e107::isInstalled('poll')) 
 {
 	header("location:".e_BASE."index.php");
 	exit;
diff --git a/e107_plugins/poll/oldpolls.php b/e107_plugins/poll/oldpolls.php
index 234d5e738..62fd56e29 100644
--- a/e107_plugins/poll/oldpolls.php
+++ b/e107_plugins/poll/oldpolls.php
@@ -15,7 +15,7 @@
  */
 
 require_once("../../class2.php");
-if (!plugInstalled('poll'))
+if (!e107::isInstalled('poll'))
 {
 	header("Location: ".e_BASE."index.php");
 	exit;
diff --git a/e107_plugins/poll/poll.php b/e107_plugins/poll/poll.php
index a180ef973..a9c274d89 100644
--- a/e107_plugins/poll/poll.php
+++ b/e107_plugins/poll/poll.php
@@ -13,7 +13,7 @@
  */
 
 require_once('../../class2.php');
-if (!plugInstalled('poll')) 
+if (!e107::isInstalled('poll')) 
 {
 	header('Location: '.e_BASE.'index.php');
 	exit;
diff --git a/e107_plugins/rss_menu/rss_menu.php b/e107_plugins/rss_menu/rss_menu.php
index 61aaeaf76..e16bfeb1e 100644
--- a/e107_plugins/rss_menu/rss_menu.php
+++ b/e107_plugins/rss_menu/rss_menu.php
@@ -15,7 +15,7 @@
  */
 
 if (!defined('e107_INIT')) { exit; }
-if (!plugInstalled('rss_menu')) 
+if (!e107::isInstalled('rss_menu')) 
 {
 	return '';
 }
diff --git a/e107_plugins/trackback/admin_config.php b/e107_plugins/trackback/admin_config.php
index d86c1ecc7..21a74508d 100644
--- a/e107_plugins/trackback/admin_config.php
+++ b/e107_plugins/trackback/admin_config.php
@@ -13,7 +13,7 @@
  *
 */
 require_once("../../class2.php");
-if (!getperms("P") || !plugInstalled('trackback')) 
+if (!getperms("P") || !e107::isInstalled('trackback')) 
 {
 	header("location:".e_BASE."index.php");
 	exit() ;
diff --git a/e107_plugins/trackback/modtrackback.php b/e107_plugins/trackback/modtrackback.php
index ed6eda72a..10b0cfefb 100644
--- a/e107_plugins/trackback/modtrackback.php
+++ b/e107_plugins/trackback/modtrackback.php
@@ -17,7 +17,7 @@
 $eplug_admin = true;
 require_once("../../class2.php");
 
-if (!getperms("P") || !plugInstalled('trackback') || !$pref['trackbackEnabled'])
+if (!getperms("P") || !e107::isInstalled('trackback') || !$pref['trackbackEnabled'])
 {
 	header("location:".e_BASE."index.php");
 	exit;
diff --git a/e107_plugins/trackback/trackback.php b/e107_plugins/trackback/trackback.php
index c9d1e7c0b..e4079f139 100644
--- a/e107_plugins/trackback/trackback.php
+++ b/e107_plugins/trackback/trackback.php
@@ -15,7 +15,7 @@
  *
 */
 require_once("../../class2.php");
-if (!plugInstalled('trackback'))
+if (!e107::isInstalled('trackback'))
 {
 	exit();
 }
diff --git a/gsitemap.php b/gsitemap.php
index f9e66c42a..951c877c1 100644
--- a/gsitemap.php
+++ b/gsitemap.php
@@ -15,7 +15,7 @@
  *
 */
 require_once("class2.php");
-if(!plugInstalled('gsitemap'))
+if(!e107::isInstalled('gsitemap'))
 { 
 	header("location:".e_BASE."index.php"); 
 	exit();