diff --git a/README.md b/README.md
index 31b5ecc..b5e1ec2 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ DIRECTORY STRUCTURE
       runtime/            contains files generated during runtime
       vendor/             contains dependent 3rd-party packages
       views/              contains view files for the Web application
-      www/                contains the entry script and Web resources
+      web/                contains the entry script and Web resources
 
 
 
@@ -53,7 +53,7 @@ You can then install the Bootstrap Application using the following command:
 php composer.phar create-project --stability=dev yiisoft/yii2-app-basic yii-basic
 ~~~
 
-Now you should be able to access the application using the URL `http://localhost/yii-basic/www/`,
+Now you should be able to access the application using the URL `http://localhost/yii-basic/web/`,
 assuming `yii-basic` is directly under the document root of your Web server.
 
 
diff --git a/composer.json b/composer.json
index b01c56c..dd50b69 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
 	"extra": {
 		"yii-install-writable": [
 			"runtime",
-			"www/assets"
+			"web/assets"
 		],
 		"yii-install-executable": [
 			"yii"
diff --git a/config/AppAsset.php b/config/AppAsset.php
index 2546969..94369bf 100644
--- a/config/AppAsset.php
+++ b/config/AppAsset.php
@@ -15,8 +15,8 @@ use yii\web\AssetBundle;
  */
 class AppAsset extends AssetBundle
 {
-	public $basePath = '@wwwroot';
-	public $baseUrl = '@www';
+	public $basePath = '@webroot';
+	public $baseUrl = '@web';
 	public $css = array(
 		'css/site.css',
 	);
diff --git a/tests/functional.suite.dist.yml b/tests/functional.suite.dist.yml
index aa777ac..6dd9193 100644
--- a/tests/functional.suite.dist.yml
+++ b/tests/functional.suite.dist.yml
@@ -11,5 +11,5 @@ modules:
     enabled: [Filesystem, TestHelper, Yii2]
     config:
         Yii2:
-            entryScript: 'www/index-test.php'
+            entryScript: 'web/index-test.php'
             url: 'http://localhost/'
diff --git a/www/assets/.gitignore b/web/assets/.gitignore
similarity index 100%
rename from www/assets/.gitignore
rename to web/assets/.gitignore
diff --git a/www/css/site.css b/web/css/site.css
similarity index 100%
rename from www/css/site.css
rename to web/css/site.css
diff --git a/www/index-test.php b/web/index-test.php
similarity index 100%
rename from www/index-test.php
rename to web/index-test.php
diff --git a/www/index.php b/web/index.php
similarity index 100%
rename from www/index.php
rename to web/index.php