diff --git a/extensions/README.md b/extensions/README.md
index a840f05942..34ad967afd 100644
--- a/extensions/README.md
+++ b/extensions/README.md
@@ -9,7 +9,7 @@ To add a new extension named `xyz` (must be in lower case), take the following s
    * `CHANGELOG.md`
    * `LICENSE.md`
 3. ask Qiang to create a subsplit for `xyz` and a composer package named `yii2-xyz`;
-4. modify `/composer.json` and add `xyz` to the `replace` section;
+4. modify `/composer.json` and add `yiisoft/yii2-xyz` to the `replace` section;
 5. If an extension contains js/css files or depends on external bower packages:
    * create `bower.json`
    * ask Qiang to register a bower package with the name `yii2-xyz`
diff --git a/extensions/bootstrap/BootstrapAsset.php b/extensions/bootstrap/BootstrapAsset.php
index f9f6f0cfa2..313a7870af 100644
--- a/extensions/bootstrap/BootstrapAsset.php
+++ b/extensions/bootstrap/BootstrapAsset.php
@@ -17,8 +17,8 @@ use yii\web\AssetBundle;
  */
 class BootstrapAsset extends AssetBundle
 {
-    public $sourcePath = '@bower/bootstrap';
+    public $sourcePath = '@bower/bootstrap/dist';
     public $css = [
-        'dist/css/bootstrap.css',
+        'css/bootstrap.css',
     ];
 }
diff --git a/extensions/bootstrap/BootstrapPluginAsset.php b/extensions/bootstrap/BootstrapPluginAsset.php
index aa30b53a10..6af1adcf73 100644
--- a/extensions/bootstrap/BootstrapPluginAsset.php
+++ b/extensions/bootstrap/BootstrapPluginAsset.php
@@ -17,9 +17,9 @@ use yii\web\AssetBundle;
  */
 class BootstrapPluginAsset extends AssetBundle
 {
-    public $sourcePath = '@bower/bootstrap';
+    public $sourcePath = '@bower/bootstrap/dist';
     public $js = [
-        'dist/js/bootstrap.js',
+        'js/bootstrap.js',
     ];
     public $depends = [
         'yii\web\JqueryAsset',
diff --git a/extensions/bootstrap/BootstrapThemeAsset.php b/extensions/bootstrap/BootstrapThemeAsset.php
index 94ecb40d6e..60747a9059 100644
--- a/extensions/bootstrap/BootstrapThemeAsset.php
+++ b/extensions/bootstrap/BootstrapThemeAsset.php
@@ -17,9 +17,9 @@ use yii\web\AssetBundle;
  */
 class BootstrapThemeAsset extends AssetBundle
 {
-    public $sourcePath = '@bower/bootstrap';
+    public $sourcePath = '@bower/bootstrap/dist';
     public $css = [
-        'dist/css/bootstrap-theme.css',
+        'css/bootstrap-theme.css',
     ];
     public $depends = [
         'yii\bootstrap\BootstrapAsset',
diff --git a/extensions/gii/TypeAheadAsset.php b/extensions/gii/TypeAheadAsset.php
index 1f467b75ae..49fd737568 100644
--- a/extensions/gii/TypeAheadAsset.php
+++ b/extensions/gii/TypeAheadAsset.php
@@ -16,9 +16,9 @@ use yii\web\AssetBundle;
  */
 class TypeAheadAsset extends AssetBundle
 {
-    public $sourcePath = '@bower/typeahead.js';
+    public $sourcePath = '@bower/typeahead.js/dist';
     public $js = [
-        'dist/typeahead.bundle.js',
+        'typeahead.bundle.js',
     ];
     public $depends = [
         'yii\bootstrap\BootstrapAsset',
diff --git a/framework/widgets/MaskedInputAsset.php b/framework/widgets/MaskedInputAsset.php
index b758670f09..2325571a52 100644
--- a/framework/widgets/MaskedInputAsset.php
+++ b/framework/widgets/MaskedInputAsset.php
@@ -19,9 +19,9 @@ use yii\web\AssetBundle;
  */
 class MaskedInputAsset extends AssetBundle
 {
-    public $sourcePath = '@bower/jquery.inputmask';
+    public $sourcePath = '@bower/jquery.inputmask/dist';
     public $js = [
-        'dist/jquery.inputmask.bundle.js'
+        'jquery.inputmask.bundle.js'
     ];
     public $depends = [
         'yii\web\YiiAsset'