diff --git a/apps/bootstrap/config/assets.php b/apps/bootstrap/config/assets.php
index 9ded686..eb947aa 100644
--- a/apps/bootstrap/config/assets.php
+++ b/apps/bootstrap/config/assets.php
@@ -12,7 +12,7 @@ return array(
 		),
 		'depends' => array(
 			'yii',
-			'twitter/bootstrap-responsive',
+			'yii/bootstrap-responsive',
 		),
 	),
 );
diff --git a/yii/assets.php b/yii/assets.php
index 911bc62..ef919a9 100644
--- a/yii/assets.php
+++ b/yii/assets.php
@@ -1,18 +1,18 @@
 <?php
 
 return array(
-	'jquery' => array(
+	'yii' => array(
 		'sourcePath' => __DIR__ . '/assets',
 		'js' => array(
-			'jquery.min.js',
+			'yii.js',
 		),
+		'depends' => array('yii/jquery'),
 	),
-	'yii' => array(
+	'yii/jquery' => array(
 		'sourcePath' => __DIR__ . '/assets',
 		'js' => array(
-			'yii.js',
+			'jquery.min.js',
 		),
-		'depends' => array('jquery'),
 	),
 	'yii/validation' => array(
 		'sourcePath' => __DIR__ . '/assets',
@@ -42,7 +42,7 @@ return array(
 		),
 		'depends' => array('yii'),
 	),
-	'twitter/bootstrap' => array(
+	'yii/bootstrap' => array(
 		'sourcePath' => __DIR__ . '/assets',
 		'css' => array(
 			'bootstrap/css/bootstrap.css',
@@ -50,16 +50,16 @@ return array(
 		'js' => array(
 			'bootstrap/js/bootstrap.js',
 		),
-		'depends' => array('jquery'),
+		'depends' => array('yii/jquery'),
 	),
-	'twitter/bootstrap-responsive' => array(
+	'yii/bootstrap-responsive' => array(
 		'sourcePath' => __DIR__ . '/assets',
 		'css' => array(
 			'bootstrap/css/bootstrap-responsive.css',
 		),
-		'depends' => array('twitter/bootstrap'),
+		'depends' => array('yii/bootstrap'),
 	),
-	'punycode' => array(
+	'yii/punycode' => array(
 		'sourcePath' => __DIR__ . '/vendor/bestiejs/punycode.js',
 		'js' => array(
 			'punycode.min.js',
diff --git a/yii/validators/EmailValidator.php b/yii/validators/EmailValidator.php
index 4297f12..0733d2c 100644
--- a/yii/validators/EmailValidator.php
+++ b/yii/validators/EmailValidator.php
@@ -135,7 +135,7 @@ class EmailValidator extends Validator
 
 		$view->registerAssetBundle('yii/validation');
 		if ($this->enableIDN) {
-			$view->registerAssetBundle('punycode');
+			$view->registerAssetBundle('yii/punycode');
 		}
 		return 'yii.validation.email(value, messages, ' . Json::encode($options) . ');';
 	}
diff --git a/yii/validators/UrlValidator.php b/yii/validators/UrlValidator.php
index bbd8883..e7f344a 100644
--- a/yii/validators/UrlValidator.php
+++ b/yii/validators/UrlValidator.php
@@ -140,7 +140,7 @@ class UrlValidator extends Validator
 
 		$view->registerAssetBundle('yii/validation');
 		if ($this->enableIDN) {
-			$view->registerAssetBundle('punycode');
+			$view->registerAssetBundle('yii/punycode');
 		}
 		return 'yii.validation.url(value, messages, ' . Json::encode($options) . ');';
 	}