diff --git a/packages/angular-cli/ember-cli/lib/cli/cli.js b/packages/angular-cli/ember-cli/lib/cli/cli.js
index 1cb5f67e7483..ecbb80172749 100644
--- a/packages/angular-cli/ember-cli/lib/cli/cli.js
+++ b/packages/angular-cli/ember-cli/lib/cli/cli.js
@@ -62,12 +62,12 @@ CLI.prototype.run = function(environment) {
     if (!platform.isValid && !this.testing) {
       if (platform.isDeprecated) {
         this.ui.writeDeprecateLine('Node ' + process.version +
-                                   ' is no longer supported by Ember CLI. Please update to a more recent version of Node');
+                                   ' is no longer supported by Angular CLI. Please update to a more recent version of Node');
       }
 
       if (platform.isUntested) {
         this.ui.writeWarnLine('WARNING: Node ' + process.version +
-                              ' has currently not been tested against Ember CLI and may result in unexpected behaviour.');
+                              ' has currently not been tested against Angular CLI and may result in unexpected behaviour.');
       }
     }
 
diff --git a/packages/angular-cli/ember-cli/lib/commands/generate.js b/packages/angular-cli/ember-cli/lib/commands/generate.js
index 8c9f5bc02dcc..48f0db1db2eb 100644
--- a/packages/angular-cli/ember-cli/lib/commands/generate.js
+++ b/packages/angular-cli/ember-cli/lib/commands/generate.js
@@ -35,9 +35,9 @@ module.exports = Command.extend({
     var blueprintName = rawArgs[0];
 
     if (!blueprintName) {
-      return Promise.reject(new SilentError('The `ember generate` command requires a ' +
+      return Promise.reject(new SilentError('The `ng generate` command requires a ' +
                                             'blueprint name to be specified. ' +
-                                            'For more details, use `ember help`.'));
+                                            'For more details, use `ng help`.'));
     }
     var Task = this.tasks.GenerateFromBlueprint;
     var task = new Task({
diff --git a/packages/angular-cli/ember-cli/lib/commands/test.js b/packages/angular-cli/ember-cli/lib/commands/test.js
index 170e9111d22c..87363a93bf42 100644
--- a/packages/angular-cli/ember-cli/lib/commands/test.js
+++ b/packages/angular-cli/ember-cli/lib/commands/test.js
@@ -3,7 +3,6 @@
 var Command     = require('../models/command');
 var SilentError = require('silent-error');
 var path        = require('path');
-var win         = require('../utilities/windows-admin');
 var existsSync  = require('exists-sync');
 
 var defaultPort = 7357;
diff --git a/packages/angular-cli/ember-cli/lib/utilities/windows-admin.js b/packages/angular-cli/ember-cli/lib/utilities/windows-admin.js
deleted file mode 100644
index f5a6d69e50c6..000000000000
--- a/packages/angular-cli/ember-cli/lib/utilities/windows-admin.js
+++ /dev/null
@@ -1,41 +0,0 @@
-'use strict';
-
-var Promise = require('../ext/promise');
-var chalk   = require('chalk');
-var exec    = require('child_process').exec;
-
-module.exports = {
-  /**
-   * Uses the eon-old command NET SESSION to determine whether or not the
-   * current user has elevated rights (think sudo, but Windows).
-   *
-   * @method checkWindowsElevation
-   * @param  {Object} ui - ui object used to call writeLine();
-   * @return {Object} Object describing whether we're on windows and if admin rights exist
-   */
-  checkWindowsElevation: function (ui) {
-    return new Promise(function (resolve) {
-      if (/^win/.test(process.platform)) {
-        exec('NET SESSION', function (error, stdout, stderr) {
-          var elevated = (!stderr || stderr.length === 0);
-
-          if (!elevated && ui && ui.writeLine) {
-            ui.writeLine(chalk.yellow('\nRunning without elevated rights. ' +
-              'Running Ember CLI "as Administrator" increases performance significantly.'));
-            ui.writeLine('See ember-cli.com/user-guide/#windows for details.\n');
-          }
-
-          resolve({
-            windows: true,
-            elevated: elevated
-          });
-        });
-      } else {
-        resolve({
-          windows: false,
-          elevated: null
-        });
-      }
-    });
-  }
-};