diff --git a/app/modules/app_defaults.php b/app/modules/app_defaults.php
index d643c54736..43adc1c143 100644
--- a/app/modules/app_defaults.php
+++ b/app/modules/app_defaults.php
@@ -27,7 +27,7 @@
 
 //use the module class to get the list of modules from the db and add any missing modules
 	if ($domains_processed == 1) {
-		$mod = new switch_modules;
+		$mod = new modules;
 		$mod->db = $db;
 		$mod->dir = $_SESSION['switch']['mod']['dir'];
 		$mod->get_modules();
diff --git a/app/modules/modules.php b/app/modules/modules.php
index e80db61e01..62b01cb57d 100644
--- a/app/modules/modules.php
+++ b/app/modules/modules.php
@@ -69,7 +69,7 @@ if (strlen($_GET["a"]) > 0) {
 }
 
 //use the module class to get the list of modules from the db and add any missing modules
-	$mod = new switch_modules;
+	$mod = new modules;
 	$mod->db = $db;
 	$mod->dir = $_SESSION['switch']['mod']['dir'];
 	$mod->get_modules();
diff --git a/app/modules/resources/classes/modules.php b/app/modules/resources/classes/modules.php
index 95f8c7fbe2..a16352d34d 100644
--- a/app/modules/resources/classes/modules.php
+++ b/app/modules/resources/classes/modules.php
@@ -28,7 +28,7 @@ include "root.php";
 //add the database structure
 /*
 require_once "resources/classes/modules.php";
-$mod = new switch_modules;
+$mod = new modules;
 $mod->dir = $_SESSION['switch']['mod']['dir'];
 echo $mod->dir."\n";
 //database connection object
@@ -65,7 +65,7 @@ echo $mod->dir."\n";
 */
 
 //define the directory class
-	class switch_modules {
+	class modules {
 		public $db;
 		public $dir;
 		public $fp;
diff --git a/app/system/system.php b/app/system/system.php
index 7378330484..8e4f3ea0ea 100644
--- a/app/system/system.php
+++ b/app/system/system.php
@@ -336,14 +336,9 @@ echo "<br />";
 		echo "	</tr>\n";
 
 		$mc_fail = false;
-
-		require_once "resources/classes/modules.php";
-		$mod = new switch_modules;
-
+		$mod = new modules;
 		if ($mod -> active("mod_memcache")) {
-
 			$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
-
 			if ($fp) {
 				$switch_cmd = "memcache status verbose";
 				$switch_result = event_socket_request($fp, 'api '.$switch_cmd);