diff --git a/README.md b/README.md
index 9050471c72..0c8d2bd25f 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ with NPM 3 or higher.
 
 * [Installation](#installation)
 * [Usage](#usage)
-* [Generating a New Project](#generating-and-serving-an-angular2-project-via-a-development-server)
+* [Generating a New Project](#generating-and-serving-an-angular-project-via-a-development-server)
 * [Generating Components, Directives, Pipes and Services](#generating-components-directives-pipes-and-services)
 * [Updating Angular CLI](#updating-angular-cli)
 * [Development Hints for hacking on Angular CLI](#development-hints-for-hacking-on-angular-cli)
@@ -54,7 +54,7 @@ npm install -g @angular/cli
 ng help
 ```
 
-### Generating and serving an Angular2 project via a development server
+### Generating and serving an Angular project via a development server
 
 ```bash
 ng new PROJECT_NAME
diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/polyfills.ts b/packages/@angular/cli/blueprints/ng2/files/__path__/polyfills.ts
index 55d9d8c610..53bdaf1b86 100644
--- a/packages/@angular/cli/blueprints/ng2/files/__path__/polyfills.ts
+++ b/packages/@angular/cli/blueprints/ng2/files/__path__/polyfills.ts
@@ -53,7 +53,7 @@ import 'core-js/es7/reflect';
 /***************************************************************************************************
  * Zone JS is required by Angular itself.
  */
-import 'zone.js/dist/zone';  // Included with Angular-CLI.
+import 'zone.js/dist/zone';  // Included with Angular CLI.
 
 
 
diff --git a/packages/@angular/cli/blueprints/ng2/files/protractor.conf.js b/packages/@angular/cli/blueprints/ng2/files/protractor.conf.js
index 4fac40b307..c819669c0a 100644
--- a/packages/@angular/cli/blueprints/ng2/files/protractor.conf.js
+++ b/packages/@angular/cli/blueprints/ng2/files/protractor.conf.js
@@ -20,7 +20,6 @@ exports.config = {
     defaultTimeoutInterval: 30000,
     print: function() {}
   },
-  useAllAngular2AppRoots: true,
   beforeLaunch: function() {
     require('ts-node').register({
       project: 'e2e'
diff --git a/packages/@angular/cli/models/config.ts b/packages/@angular/cli/models/config.ts
index 7090cfe6d9..bd45c70405 100644
--- a/packages/@angular/cli/models/config.ts
+++ b/packages/@angular/cli/models/config.ts
@@ -36,7 +36,7 @@ function getUserHome() {
 
 export class CliConfig extends CliConfigBase<ConfigInterface> {
   static configFilePath(projectPath?: string): string {
-    // Find the configuration, either where specified, in the angular-cli project
+    // Find the configuration, either where specified, in the Angular CLI project
     // (if it's in node_modules) or from the current process.
     return (projectPath && _findUp(CLI_CONFIG_FILE_NAME, projectPath))
         || (projectPath && _findUp(CLI_CONFIG_FILE_NAME_ALT, projectPath))
diff --git a/packages/@angular/cli/package.json b/packages/@angular/cli/package.json
index c0607d3ae8..af781d1268 100644
--- a/packages/@angular/cli/package.json
+++ b/packages/@angular/cli/package.json
@@ -9,7 +9,8 @@
   },
   "keywords": [
     "angular",
-    "angular-cli"
+    "angular-cli",
+    "Angular CLI"
   ],
   "repository": {
     "type": "git",
diff --git a/plugins/karma.js b/plugins/karma.js
index 84c6afdea9..a46d7d5ac1 100644
--- a/plugins/karma.js
+++ b/plugins/karma.js
@@ -1,4 +1,4 @@
-// This file is necessary when using a linked angular-cli to this repo, meaning that
+// This file is necessary when using a linked @angular/cli to this repo, meaning that
 // require('@angular/cli/plugins/karma') will load this file, and we just forward to
 // the actual published file.
 module.exports = require('../packages/@angular/cli/plugins/karma');