diff --git a/CHANGELOG b/CHANGELOG
index 0928b4bfb..d493577a9 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -54,7 +54,7 @@ Version 1.1.11 work in progress
 - Enh: Added HTML5 history support on ajax requests on CGridView and CListView using History.js v1.7.2-r2 (https://github.com/balupton/history.js) from Benjamin Arthur Lupton (lightglitch)
 - Enh: Changed CldrCommand to use medium dateTimeFormat and updated 18n data using newest(6546) CLDR (tanakahisateru)
 - Enh: Added CErrorHandler::getHttpHeader() to send correct HTTP error codes (pgaultier)
-- Enh: CClientScript::$scriptFilePosition and CClientScript::$scriptPosition for controlling default $position values for registerScriptFile and registerScript (resurtm)
+- Enh: CClientScript::$defaultScriptFilePosition and CClientScript::$defaultScriptPosition for controlling default $position argument for registerScriptFile and registerScript (resurtm)
 - Chg #440: Upgraded JQuery UI to 1.8.20 (samdark)
 - Chg #497: Added log component and preloaded it in default console application config in order to properly log errors (samdark)
 - Chg: Upgraded jQuery to 1.7.2 (samdark)
diff --git a/framework/web/CClientScript.php b/framework/web/CClientScript.php
index eeeb3caad..a70270255 100644
--- a/framework/web/CClientScript.php
+++ b/framework/web/CClientScript.php
@@ -166,14 +166,14 @@ class CClientScript extends CApplicationComponent
 	 * Defaults to CClientScript::POS_HEAD.
 	 * @since 1.1.11
 	 */
-	public $scriptFilePosition=self::POS_HEAD;
+	public $defaultScriptFilePosition=self::POS_HEAD;
 	/**
 	 * @var integer Where the scripts registered using {@link registerScript} will be inserted in the page.
 	 * This can be one of the CClientScript::POS_* constants.
 	 * Defaults to CClientScript::POS_READY.
 	 * @since 1.1.11
 	 */
-	public $scriptPosition=self::POS_READY;
+	public $defaultScriptPosition=self::POS_READY;
 
 	private $_baseUrl;
 
@@ -594,7 +594,7 @@ class CClientScript extends CApplicationComponent
 	public function registerScriptFile($url,$position=null)
 	{
 		if($position===null)
-			$position=$this->scriptFilePosition;
+			$position=$this->defaultScriptFilePosition;
 		$this->hasScripts=true;
 		$this->scriptFiles[$position][$url]=$url;
 		$params=func_get_args();
@@ -619,7 +619,7 @@ class CClientScript extends CApplicationComponent
 	public function registerScript($id,$script,$position=null)
 	{
 		if($position===null)
-			$position=$this->scriptPosition;
+			$position=$this->defaultScriptPosition;
 		$this->hasScripts=true;
 		$this->scripts[$position][$id]=$script;
 		if($position===self::POS_READY || $position===self::POS_LOAD)