diff --git a/README.md b/README.md
index 208351462c..7436411c39 100644
--- a/README.md
+++ b/README.md
@@ -24,14 +24,16 @@ and applications on [Google App Engine](http://cloud.google.com/nodejs).
 
 ### Databases
 
-- MongoDB - [Source code][mongo_1] | [App Engine Tutorial][mongo_2] | [Documentation][mongo_3]
+- MongoDB - [Source code][mongodb_1] | [App Engine Tutorial][mongodb_2] | [Documentation][mongodb_3]
 - Redis - [Source code][redis_1] | [App Engine Tutorial][redis_2] | [Documentation][redis_3]
 
 ### Tools
 
 - gcloud-node - [Source code][gcloud_1] | [Documentation][gcloud_2]
-- Grunt.js - [Source code][grunt_1] | [App Engine Tutorial][grunt_2] | [Live demo][grunt_3] | [Documentation][grunt_4]
+- Bower - [Source code][bower_1] | [App Engine Tutorial][bower_2] | [Documentation][bower_3]
+- Grunt - [Source code][grunt_1] | [App Engine Tutorial][grunt_2] | [Live demo][grunt_3] | [Documentation][grunt_4]
 - Mailgun - [Source code][mailgun_1] | [App Engine Tutorial][mailgun_2] | [Documentation][mailgun_3]
+- Webpack - [Source code][webpack_1] | [App Engine Tutorial][webpack_2] | [Documentation][webpack_3]
 
 ## Google Storage
 
@@ -108,9 +110,9 @@ See [LICENSE](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/ma
 [sails_3]: http://sails-dot-nodejs-docs-samples.appspot.com
 [sails_4]: http://sailsjs.org/
 
-[mongo_1]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/appengine/mongo
-[mongo_2]: https://cloud.google.com/nodejs/resources/databases/mongo
-[mongo_3]: https://docs.mongodb.org/
+[mongodb_1]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/appengine/mongodb
+[mongodb_2]: https://cloud.google.com/nodejs/resources/databases/mongo
+[mongodb_3]: https://docs.mongodb.org/
 
 [redis_1]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/appengine/redis
 [redis_2]: https://cloud.google.com/nodejs/resources/databases/redis
@@ -119,6 +121,10 @@ See [LICENSE](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/ma
 [gcloud_1]: https://github.com/GoogleCloudPlatform/gcloud-node
 [gcloud_2]: https://googlecloudplatform.github.io/gcloud-node/#/
 
+[bower_1]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/appengine/bower
+[bower_2]: https://cloud.google.com/nodejs/resources/tools/bower
+[bower_3]: http://bower.io/
+
 [grunt_1]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/appengine/grunt
 [grunt_2]: https://cloud.google.com/nodejs/resources/tools/grunt
 [grunt_3]: http://grunt-dot-nodejs-docs-samples.appspot.com
@@ -128,6 +134,10 @@ See [LICENSE](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/ma
 [mailgun_2]: https://cloud.google.com/nodejs/resources/tools/mailgun
 [mailgun_3]: http://www.mailgun.com/
 
+[webpack_1]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/appengine/webpack
+[webpack_2]: https://cloud.google.com/nodejs/resources/tools/webpack
+[webpack_3]: https://webpack.github.io/
+
 [nodejs_1]: https://github.com/GoogleCloudPlatform/nodejs-getting-started
 [nodejs_2]: https://cloud.google.com/nodejs/getting-started/hello-world
 [nodejs_3]: https://cloud.google.com/nodejs/getting-started/tutorial-app
diff --git a/appengine/mongo/.gitignore b/appengine/mongodb/.gitignore
similarity index 100%
rename from appengine/mongo/.gitignore
rename to appengine/mongodb/.gitignore
diff --git a/appengine/mongo/README.md b/appengine/mongodb/README.md
similarity index 100%
rename from appengine/mongo/README.md
rename to appengine/mongodb/README.md
diff --git a/appengine/mongo/app.yaml b/appengine/mongodb/app.yaml
similarity index 100%
rename from appengine/mongo/app.yaml
rename to appengine/mongodb/app.yaml
diff --git a/appengine/mongo/package.json b/appengine/mongodb/package.json
similarity index 92%
rename from appengine/mongo/package.json
rename to appengine/mongodb/package.json
index 9fb8a113e6..374d36372b 100644
--- a/appengine/mongo/package.json
+++ b/appengine/mongodb/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "appengine-mongo",
+  "name": "appengine-mongodb",
   "description": "An example of using MongoDB with Node.js on Google App Engine.",
   "version": "0.0.1",
   "private": true,
diff --git a/appengine/mongo/server.js b/appengine/mongodb/server.js
similarity index 99%
rename from appengine/mongo/server.js
rename to appengine/mongodb/server.js
index fb189dff5b..6a13cec803 100644
--- a/appengine/mongo/server.js
+++ b/appengine/mongodb/server.js
@@ -24,6 +24,8 @@ nconf.argv().env().file('keys.json');
 
 // Connect to a MongoDB server provisioned over at 
 // MongoLab.  See the README for more info.
+
+// [START client]
 var uri = 'mongodb://' +
   nconf.get('mongoUser') + ':' +
   nconf.get('mongoPass') + '@' +
@@ -31,7 +33,6 @@ var uri = 'mongodb://' +
   nconf.get('mongoPort') + '/' +
   nconf.get('mongoDatabase');
 
-// [START client]
 mongodb.MongoClient.connect(uri, function(err, db) {
   
   if (err) {