diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 0519450..4ac0382 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -50,7 +50,7 @@
  * ------------------------------------------------------
  */
 
-$BM =& _load_class('CI_Benchmark');
+$BM =& _load_class('Benchmark');
 $BM->mark('code_igniter_start');
 
 /*
@@ -59,7 +59,7 @@
  * ------------------------------------------------------
  */
 
-$EXT =& _load_class('CI_Hooks');
+$EXT =& _load_class('Hooks');
 
 /*
  * ------------------------------------------------------
@@ -74,9 +74,9 @@
  * ------------------------------------------------------
  */
 
-$CFG =& _load_class('CI_Config');
-$RTR =& _load_class('CI_Router');
-$OUT =& _load_class('CI_Output');
+$CFG =& _load_class('Config');
+$RTR =& _load_class('Router');
+$OUT =& _load_class('Output');
 
 /*
  * ------------------------------------------------------
@@ -98,9 +98,9 @@
  * ------------------------------------------------------
  */
 
-$IN		=& _load_class('CI_Input');
-$URI	=& _load_class('CI_URI');
-$LANG	=& _load_class('CI_Language');
+$IN		=& _load_class('Input');
+$URI	=& _load_class('URI');
+$LANG	=& _load_class('Language');
 
 /*
  * ------------------------------------------------------
@@ -115,7 +115,7 @@
  * 
  */
  
-_load_class('CI_Loader', FALSE); 
+_load_class('Loader', FALSE); 
   
 if (floor(phpversion()) < 5)
 {
@@ -126,7 +126,7 @@
 	require(BASEPATH.'codeigniter/Base5'.EXT);
 }
 
-_load_class('CI_Controller', FALSE); 
+_load_class('Controller', FALSE); 
 
 require(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT);