diff --git a/build/build.xml b/build/build.xml
index 9c18af0..85d5aa5 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -265,7 +265,7 @@ Please update yiisite/common/data/versions.php file with the following code:
 
     where <target name> can be one of the following:
 
-    - sync    : synchronize yiilite.php and YiiBase.php
+    - sync    : synchronize yiilite.php and AbstractYii.php
     - message : extract i18n messages of the framework
     - src     : build source release
     - doc     : build documentation release (Windows only)
diff --git a/build/controllers/ClassmapController.php b/build/controllers/ClassmapController.php
index 2a0483c..10eb134 100644
--- a/build/controllers/ClassmapController.php
+++ b/build/controllers/ClassmapController.php
@@ -45,7 +45,7 @@ class ClassmapController extends Controller
 			'only' => array('.php'),
 			'except' => array(
 				'Yii.php',
-				'YiiBase.php',
+				'AbstractYii.php',
 				'/debug/',
 				'/console/',
 				'/test/',
diff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php
index 5aac7e5..4fed3b2 100644
--- a/build/controllers/PhpDocController.php
+++ b/build/controllers/PhpDocController.php
@@ -56,7 +56,7 @@ class PhpDocController extends Controller
 			},
 			'only' => array('.php'),
 			'except' => array(
-				'YiiBase.php',
+				'AbstractYii.php',
 				'Yii.php',
 				'/debug/views/',
 				'/requirements/',
diff --git a/docs/internals/autoloader.md b/docs/internals/autoloader.md
index b7696d7..067773d 100644
--- a/docs/internals/autoloader.md
+++ b/docs/internals/autoloader.md
@@ -16,4 +16,4 @@ PEAR-style libraries
 References
 ----------
 
-- YiiBase::autoload
\ No newline at end of file
+- AbstractYii::autoload
\ No newline at end of file
diff --git a/framework/yii/YiiBase.php b/framework/yii/AbstractYii.php
similarity index 98%
rename from framework/yii/YiiBase.php
rename to framework/yii/AbstractYii.php
index f04903d..c40aad9 100644
--- a/framework/yii/YiiBase.php
+++ b/framework/yii/AbstractYii.php
@@ -49,15 +49,15 @@ defined('YII_ENABLE_ERROR_HANDLER') or define('YII_ENABLE_ERROR_HANDLER', true);
 
 
 /**
- * YiiBase is the core helper class for the Yii framework.
+ * AbstractYii is the core helper class for the Yii framework.
  *
- * Do not use YiiBase directly. Instead, use its child class [[Yii]] where
- * you can customize methods of YiiBase.
+ * Do not use AbstractYii directly. Instead, use its child class [[Yii]] where
+ * you can customize methods of AbstractYii.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class YiiBase
+abstract class AbstractYii
 {
 	/**
 	 * @var array class map used by the Yii autoloading mechanism.
diff --git a/framework/yii/Yii.php b/framework/yii/Yii.php
index bde15cc..0406463 100644
--- a/framework/yii/Yii.php
+++ b/framework/yii/Yii.php
@@ -12,13 +12,13 @@ require(__DIR__ . '/YiiBase.php');
 /**
  * Yii is a helper class serving common framework functionalities.
  *
- * It extends from [[YiiBase]] which provides the actual implementation.
- * By writing your own Yii class, you can customize some functionalities of [[YiiBase]].
+ * It extends from [[AbstractYii]] which provides the actual implementation.
+ * By writing your own Yii class, you can customize some functionalities of [[AbstractYii]].
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Yii extends \yii\YiiBase
+class Yii extends \yii\AbstractYii
 {
 }
 
diff --git a/framework/yii/log/Logger.php b/framework/yii/log/Logger.php
index 54f3a49..76354d4 100644
--- a/framework/yii/log/Logger.php
+++ b/framework/yii/log/Logger.php
@@ -220,7 +220,7 @@ class Logger extends Component
 	 * Returns the total elapsed time since the start of the current request.
 	 * This method calculates the difference between now and the timestamp
 	 * defined by constant `YII_BEGIN_TIME` which is evaluated at the beginning
-	 * of [[YiiBase]] class file.
+	 * of [[AbstractYii]] class file.
 	 * @return float the total elapsed time in seconds for current request.
 	 */
 	public function getElapsedTime()