Repository: ember-cli/ember-cli
Pull request #7322 (2017-09-05 21:18:43)

[INTERNAL] Update NPM to npm
The company and project is spelled `npm`, not `NPM`. These are mixed throughout this project. This updates the tests, readme wording, changelog, comments, blueprints and similar to reflect this.

I intentionally did not touch function names.

https://www.npmjs.com/policies/trademark


Patch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed021e7e1..2958de68b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -744,7 +744,7 @@ version:
 - [#6674](https://github.com/ember-cli/ember-cli/pull/6674) Update core-object to the latest version 🚀 [@ember-cli](https://github.com/ember-cli)
 - [#6685](https://github.com/ember-cli/ember-cli/pull/6685) Revert "remove travis sudo check" [@ember-cli](https://github.com/ember-cli)
 - [#6683](https://github.com/ember-cli/ember-cli/pull/6683) ensure `Task.prototype.run` returns promises [@ember-cli](https://github.com/ember-cli)
-- [#6680](https://github.com/ember-cli/ember-cli/pull/6680) Use global NPM with version check [@Turbo87](https://github.com/Turbo87)
+- [#6680](https://github.com/ember-cli/ember-cli/pull/6680) Use global npm with version check [@Turbo87](https://github.com/Turbo87)
 - [#6681](https://github.com/ember-cli/ember-cli/pull/6681) Run "ember-cli-eslint" blueprint on "ember init" [@Turbo87](https://github.com/Turbo87)
 - [#6678](https://github.com/ember-cli/ember-cli/pull/6678) Avoid error upon registering a heimdall monitor twice. [@rwjblue](https://github.com/rwjblue)
 - [#6682](https://github.com/ember-cli/ember-cli/pull/6682) Update the minimum version of ember-try [@kategengler](https://github.com/kategengler)
@@ -829,7 +829,7 @@ version:
 - [#6644](https://github.com/ember-cli/ember-cli/pull/6644) Use  ES6 classes for internal classes [@Turbo87](https://github.com/Turbo87)
 - [#6654](https://github.com/ember-cli/ember-cli/pull/6654) blueprints/app: Update "ember-cli-qunit" dependency [@Turbo87](https://github.com/Turbo87)
 - [#6688](https://github.com/ember-cli/ember-cli/pull/6688) Replace custom Promise class with RSVP [@Turbo87](https://github.com/Turbo87)
-- [#6680](https://github.com/ember-cli/ember-cli/pull/6680) Use global NPM with version check [@Turbo87](https://github.com/Turbo87)
+- [#6680](https://github.com/ember-cli/ember-cli/pull/6680) Use global npm with version check [@Turbo87](https://github.com/Turbo87)
 
 Thank you to all who took the time to contribute!
 
@@ -879,7 +879,7 @@ version:
 #### Community Contributions
 
 - [#6531](https://github.com/ember-cli/ember-cli/pull/6531) Update to latest capture-exit, revert work around. [@ember-cli](https://github.com/rwjblue)
-- [#6525](https://github.com/ember-cli/ember-cli/pull/6525) utilities/npm: Run NPM commands via "execa" [@Turbo87](https://github.com/Turbo87)
+- [#6525](https://github.com/ember-cli/ember-cli/pull/6525) utilities/npm: Run npm commands via "execa" [@Turbo87](https://github.com/Turbo87)
 - [#6533](https://github.com/ember-cli/ember-cli/pull/6533) blueprints/addon: Fix path to "ember" executable in ".travis.yml" [@Turbo87](https://github.com/Turbo87)
 - [#6536](https://github.com/ember-cli/ember-cli/pull/6536) fix phantom use on travis [@kellyselden](https://github.com/kellyselden)
 - [#6537](https://github.com/ember-cli/ember-cli/pull/6537) Prevent deprecation from `ember-cli-babel` config options. [@rwjblue](https://github.com/rwjblue)
@@ -1450,7 +1450,7 @@ version:
 - [#5879](https://github.com/ember-cli/ember-cli/pull/5879) Blueprint READMEs: s/server/serve/ to match `ember help` [@chrisjshull](https://github.com/chrisjshull)
 - [#5789](https://github.com/ember-cli/ember-cli/pull/5789) Remove "home grown version checker" [@Turbo87](https://github.com/Turbo87)
 - [#5737](https://github.com/ember-cli/ember-cli/pull/5737) Update core-obect (#5547, rebased) [@nathanhammond](https://github.com/nathanhammond)
-- [#5709](https://github.com/ember-cli/ember-cli/pull/5709) Move test-loader to NPM [@trentmwillis](https://github.com/trentmwillis)
+- [#5709](https://github.com/ember-cli/ember-cli/pull/5709) Move test-loader to npm [@trentmwillis](https://github.com/trentmwillis)
 - [#5792](https://github.com/ember-cli/ember-cli/pull/5792) Add "rootURL" setting to deprecate "baseURL" [@Turbo87](https://github.com/Turbo87)
 - [#5801](https://github.com/ember-cli/ember-cli/pull/5801) Remove "ember help <something> --json" output [@Turbo87](https://github.com/Turbo87)
 - [#5819](https://github.com/ember-cli/ember-cli/pull/5819) Fix for disabling hinting for developing an addon [@jeffjewiss](https://github.com/jeffjewiss)
@@ -2054,7 +2054,7 @@ version:
   + Upgrade your project's ember-cli version - [docs](https://ember-cli.com/user-guide/#upgrading)
   + Update `ember-cli-qunit` in `package.json` to `^1.2.1`.
   + Update `ember` in `bower.json` to `2.3.0`.
-  + Remove `qunit` from `bower.json` (it is now included as an NPM dependency by ember-cli-qunit).
+  + Remove `qunit` from `bower.json` (it is now included as an npm dependency by ember-cli-qunit).
 - Addon Developers
   + [`ember addon` diff](https://github.com/kellyselden/ember-addon-output/compare/v2.2.0-beta.6...v2.3.0-beta.1)
   + No changes required
@@ -3003,7 +3003,7 @@ version:
     * `this.walkSync`         -> `require('walk-sync');`
     * `this.transpileModules` -> `require('broccoli-es6modules');`
 
-  Rather then relying on them from ember-cli, add-ons should require them via NPM.
+  Rather then relying on them from ember-cli, add-ons should require them via npm.
 
   + We now are using broccoli v0.15.3, which is a backwards compatible upgrade,
     but it does expose the new `rebuild` api, that will soon superseed the `read`
@@ -3528,7 +3528,7 @@ The following changes are required if you are upgrading from the previous versio
 
 #### Community Contributions
 
-- [#2885](https://github.com/ember-cli/ember-cli/pull/2885) [ENHANCEMENT] NPM should use save-exact flags [@chadhietala](https://github.com/chadhietala)
+- [#2885](https://github.com/ember-cli/ember-cli/pull/2885) [ENHANCEMENT] npm should use save-exact flags [@chadhietala](https://github.com/chadhietala)
 - [#2840](https://github.com/ember-cli/ember-cli/pull/2840) [INTERNAL ]using 'expect' vs. assert. [@Mawaheb](https://github.com/Mawaheb)
 - [#2669](https://github.com/ember-cli/ember-cli/pull/2669) [ENHANCEMENT] add .npmignore to addon blueprint [@pogopaule](https://github.com/pogopaule)
 - [#2909](https://github.com/ember-cli/ember-cli/pull/2909) [INTERNAL] Use lib/ext/promise instead of RSVP directly [@zeppelin](https://github.com/zeppelin)
@@ -3586,7 +3586,7 @@ Thank you to all who took the time to contribute!
   you give it to the underlying task to do it.
 
 - [#2805](https://github.com/ember-cli/ember-cli/pull/2805) Added the
-  `install:addon` command, which installs an addon with NPM and then
+  `install:addon` command, which installs an addon with npm and then
   runs the included generator of the same name  if it provides one.
 
   If the blueprint for the installed addon requires arguments, then
@@ -3709,7 +3709,7 @@ Thank you to all who took the time to contribute!
   precedence.
 
 - [#2805](https://github.com/ember-cli/ember-cli/pull/2805) Added the
-  `install:addon` command, which installs an addon with NPM and then
+  `install:addon` command, which installs an addon with npm and then
   runs the included generator of the same name if it provides one,
   additionally if you addon generator's name is different to the addon
   name, you can pass the option `defaultBlueprint` in your
@@ -3740,7 +3740,7 @@ Thank you to all who took the time to contribute!
   * `{{content-for 'test-body-footer'}}`
 * [BUGFIX] Create separate server blueprint to stop http-{mock,proxy} removing files [#2610](https://github.com/stefanpenner/ember-cli/pull/2610)
 * [BUGFIX] Fixes `--proxy` so it proxies correctly to API's under subdomains [#2615](https://github.com/stefanpenner/ember-cli/pull/2615)
-* [BUGFIX] Ensure `watchman` does not conflict with NPM's `watchman` package. [#2645](https://github.com/stefanpenner/ember-cli/pull/2645)
+* [BUGFIX] Ensure `watchman` does not conflict with npm's `watchman` package. [#2645](https://github.com/stefanpenner/ember-cli/pull/2645)
 * [BUGFIX] Ensure that the generated meta tag is now self closing. [#2661](https://github.com/stefanpenner/ember-cli/pull/2661)
 
 #### Addons
@@ -3845,7 +3845,7 @@ Thank you to all who took the time to contribute!
 * [ENHANCEMENT] Add {{content-for 'test-head'}} to `tests/index.html`. [#2236](https://github.com/stefanpenner/ember-cli/pull/2236)
 * [ENHANCEMENT] Add {{content-for 'test-body'}} to `tests/index.html`. [#2236](https://github.com/stefanpenner/ember-cli/pull/2236)
 * [ENHANCEMENT] Allow adding multiple bower packages at once via `Blueprint.prototype.addBowerPackagesToProject`. [#2222](https://github.com/stefanpenner/ember-cli/pull/2222)
-* [ENHANCEMENT] Allow adding multiple NPM packages at once via `Blueprint.prototype.addPackagesToProject`. [#2245](https://github.com/stefanpenner/ember-cli/pull/2245)
+* [ENHANCEMENT] Allow adding multiple npm packages at once via `Blueprint.prototype.addPackagesToProject`. [#2245](https://github.com/stefanpenner/ember-cli/pull/2245)
 * [ENHANCEMENT] Ensure generated addons are in strict mode. [#2295](https://github.com/stefanpenner/ember-cli/pull/2295)
 * [BUGFIX] Ensure that addon's with `addon/styles/app.css` are able to compile properly (copying contents of `addon/styles/app.css` into `vendor.css`). [#2301](https://github.com/stefanpenner/ember-cli/pull/2301)
 * [ENHANCEMENT] Provide the `httpServer` instance to `serverMiddleware` (and `./server/index.js`). [#2302](https://github.com/stefanpenner/ember-cli/issues/2302)
@@ -4168,7 +4168,7 @@ in the output path. [#1930](https://github.com/stefanpenner/ember-cli/pull/1930)
 * [ENHANCEMENT] Using broccoli-sass > 0.2.0 now allows you to use .sass files. [#1367](https://github.com/stefanpenner/ember-cli/pull/1367)
 * [ENHANCEMENT] EmberAddon constructor to build an EmberApp object with defaults for addon projects. [#1343](https://github.com/stefanpenner/ember-cli/pull/1343)
 * [ENHANCEMENT] Allow addons to be vendored outside of node modules [#1370](https://github.com/stefanpenner/ember-cli/pull/1370)
-* [ENHANCEMENT] Make "ember version" show NPM and Node version (versions of all loaded modules with "--verbose" switch). [#1307](https://github.com/stefanpenner/ember-cli/pull/1307)
+* [ENHANCEMENT] Make "ember version" show npm and Node version (versions of all loaded modules with "--verbose" switch). [#1307](https://github.com/stefanpenner/ember-cli/pull/1307)
 * [BUGFIX] Duplicate-checking for generating routes now accounts for `"`-syntax. [#1371](https://github.com/stefanpenner/ember-cli/pull/1371)
 * [BREAKING BUGFIX] Standard variables passed in to Blueprints now handle slashes better. Breaking if you relied on the old behavior. [#1278](https://github.com/stefanpenner/ember-cli/pull/1278)
 * [BUGFIX] Generating a route named 'basic' no longer adds it to router.js. [#1390](https://github.com/stefanpenner/ember-cli/pull/1390)
@@ -4361,7 +4361,7 @@ in the output path. [#1930](https://github.com/stefanpenner/ember-cli/pull/1930)
 * [BREAKING BUGFIX] No longer rely on `broccoli-bower` to automatically import vendored files. Use `app.import` to import dependencies and specify modules to whitelist. [#562](https://github.com/stefanpenner/ember-cli/pull/562)
 * [ENHANCEMENT] Removed `proxy-url` and `proxy-host` parameters and introduced `proxy` param with full proxy url. ([#567](https://github.com/stefanpenner/ember-cli/pull/567))
 * [BREAKING ENHANCEMENT] Update to jQuery 1.11.1. ** updates `bower.json`
-* [ENHANCEMENT] When using non-NPM installed package (aka "running on master") the branch name and SHA are now printed along with the prior version number. [#634](https://github.com/stefanpenner/ember-cli/pull/634)
+* [ENHANCEMENT] When using non-npm installed package (aka "running on master") the branch name and SHA are now printed along with the prior version number. [#634](https://github.com/stefanpenner/ember-cli/pull/634)
 
 ### 0.0.25
 
diff --git a/README.md b/README.md
index 76a6afbc8..ac3ede6ae 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 ember-cli
 ==============================================================================
 
-[![Latest NPM release][npm-badge]][npm-badge-url]
+[![Latest npm release][npm-badge]][npm-badge-url]
 [![TravisCI Build Status][travis-badge]][travis-badge-url]
 [![AppVeyor Build Status][appveyor-badge]][appveyor-badge-url]
 [![Test Coverage][coveralls-badge]][coveralls-badge-url]
@@ -61,7 +61,7 @@ ember new my-new-app
 ```
 
 This will create a new folder `my-new-app`, initialize a Git project in it,
-add the basic Ember.js project structure and install any necessary NPM and
+add the basic Ember.js project structure and install any necessary npm and
 Bower dependencies.
 
 
@@ -125,7 +125,7 @@ to see a list of available blueprints in your project and their options.
 ember install some-other-addon
 ```
 
-This will search NPM for a package named `some-other-addon`, install it and
+This will search npm for a package named `some-other-addon`, install it and
 run any additional install steps defined in the addon.
 
 
diff --git a/blueprints/app/files/README.md b/blueprints/app/files/README.md
index 3e30c30a2..a49d422b4 100644
--- a/blueprints/app/files/README.md
+++ b/blueprints/app/files/README.md
@@ -9,7 +9,7 @@ You will need the following things properly installed on your computer.
 
 * [Git](https://git-scm.com/)
 * [Node.js](https://nodejs.org/)<% if (yarn) { %>
-* [Yarn](https://yarnpkg.com/)<% } else { %> (with NPM)<% } %>
+* [Yarn](https://yarnpkg.com/)<% } else { %> (with npm)<% } %>
 * [Ember CLI](https://ember-cli.com/)
 * [Google Chrome](https://google.com/chrome/)
 
diff --git a/lib/broccoli/ember-app.js b/lib/broccoli/ember-app.js
index bafeeedbb..3a6972f1c 100644
--- a/lib/broccoli/ember-app.js
+++ b/lib/broccoli/ember-app.js
@@ -401,7 +401,7 @@ class EmberApp {
 
     if (this._addonInstalled('ember-resolver') || !bowerDeps['ember-resolver']) {
       // if the project is using `ember-resolver` as an addon
-      // remove it from `vendorFiles` (the NPM version properly works
+      // remove it from `vendorFiles` (the npm version properly works
       // without `app.import`s)
       delete this.vendorFiles['ember-resolver.js'];
     }
@@ -1546,7 +1546,7 @@ class EmberApp {
 
     let bowerDeps = this.project.bowerDependencies();
     if (bowerDeps['ember-cli-test-loader']) {
-      this.project.ui.writeDeprecateLine('ember-cli-test-loader should now be included as an NPM module with version 1.1.0 or greater.');
+      this.project.ui.writeDeprecateLine('ember-cli-test-loader should now be included as an npm module with version 1.1.0 or greater.');
       let testLoaderPath = this.options.outputPaths.testSupport.js.testLoader;
       let testLoader = new Funnel(external, {
         files: ['test-loader.js'],
diff --git a/lib/commands/install.js b/lib/commands/install.js
index 5637e3b97..6c4f7d2f7 100644
--- a/lib/commands/install.js
+++ b/lib/commands/install.js
@@ -14,7 +14,7 @@ module.exports = Command.extend({
     { name: 'save',       type: Boolean, default: false, aliases: ['S'] },
     { name: 'save-dev',   type: Boolean, default: true,  aliases: ['D'] },
     { name: 'save-exact', type: Boolean, default: false, aliases: ['E', 'exact'] },
-    { name: 'yarn',       type: Boolean, description: 'Use --yarn to enforce yarn usage, or --no-yarn to enforce NPM' }, // no default means use yarn if the blueprint has a yarn.lock
+    { name: 'yarn',       type: Boolean, description: 'Use --yarn to enforce yarn usage, or --no-yarn to enforce npm' }, // no default means use yarn if the blueprint has a yarn.lock
   ],
 
   anonymousOptions: [
diff --git a/lib/tasks/bower-install.js b/lib/tasks/bower-install.js
index 1d72a6d93..53f55990c 100644
--- a/lib/tasks/bower-install.js
+++ b/lib/tasks/bower-install.js
@@ -47,17 +47,17 @@ class BowerInstallTask extends Task {
   }
 
   installBower() {
-    logger.info('Installing "bower" via NPM into: %s', cliPath);
+    logger.info('Installing "bower" via npm into: %s', cliPath);
 
     let ui = this.ui;
     const chalk = require('chalk');
 
-    ui.startProgress(chalk.green('NPM: Installing bower ...'));
+    ui.startProgress(chalk.green('npm: Installing bower ...'));
 
     return execa('npm', ['install', 'bower@^1.3.12'], { cwd: cliPath })
       .finally(() => ui.stopProgress())
       .catch(error => this.handleInstallBowerError(error))
-      .then(() => ui.writeLine(chalk.green('NPM: Installed bower')));
+      .then(() => ui.writeLine(chalk.green('npm: Installed bower')));
   }
 
   handleInstallBowerError(error) {
@@ -116,7 +116,7 @@ class BowerInstallTask extends Task {
       return Promise.resolve();
     }
 
-    // resolve "bower" and install via NPM if necessary
+    // resolve "bower" and install via npm if necessary
     // -> then check if a "bower.json" file exists and create if necessary
     // -> then run the actual "bower install"
     return this.ensureBower().then(() => this.ensureBowerJson()).then(() => {
diff --git a/lib/tasks/npm-install.js b/lib/tasks/npm-install.js
index 91fd74eeb..7e013b17e 100644
--- a/lib/tasks/npm-install.js
+++ b/lib/tasks/npm-install.js
@@ -27,11 +27,11 @@ class NpmInstallTask extends NpmTask {
   }
 
   formatStartMessage(packages) {
-    return `${this.useYarn ? 'Yarn' : 'NPM'}: Installing ${formatPackageList(packages)} ...`;
+    return `${this.useYarn ? 'Yarn' : 'npm'}: Installing ${formatPackageList(packages)} ...`;
   }
 
   formatCompleteMessage(packages) {
-    return `${this.useYarn ? 'Yarn' : 'NPM'}: Installed ${formatPackageList(packages)}`;
+    return `${this.useYarn ? 'Yarn' : 'npm'}: Installed ${formatPackageList(packages)}`;
   }
 }
 
diff --git a/lib/tasks/npm-task.js b/lib/tasks/npm-task.js
index 02f7a45b5..d8bb7305f 100644
--- a/lib/tasks/npm-task.js
+++ b/lib/tasks/npm-task.js
@@ -66,11 +66,11 @@ class NpmTask extends Task {
 
         let below = semver.ltr(version, this.versionConstraints);
         if (below) {
-          throw new SilentError('Ember CLI is now using the global NPM, but your NPM version is outdated.\n' +
-            'Please update your global NPM version by running: npm install -g npm');
+          throw new SilentError('Ember CLI is now using the global npm, but your npm version is outdated.\n' +
+            'Please update your global npm version by running: npm install -g npm');
         }
 
-        this.ui.writeWarnLine('Ember CLI is using the global NPM, but your NPM version has not yet been ' +
+        this.ui.writeWarnLine('Ember CLI is using the global npm, but your npm version has not yet been ' +
           'verified to work with the current Ember CLI release.');
       }
 
@@ -78,8 +78,8 @@ class NpmTask extends Task {
       logger.error('npm --version failed: %s', error);
 
       if (error.code === 'ENOENT') {
-        throw new SilentError('Ember CLI is now using the global NPM, but was not able to find it.\n' +
-          'Please install NPM using the instructions at https://github.com/npm/npm');
+        throw new SilentError('Ember CLI is now using the global npm, but was not able to find it.\n' +
+          'Please install npm using the instructions at https://github.com/npm/npm');
       }
 
       throw error;
@@ -201,7 +201,7 @@ class NpmTask extends Task {
       } else if (options['save-dev']) {
         args.push('add', '--dev');
       } else if (options.packages) {
-        throw new Error(`NPM command "${command} ${options.packages.join(' ')}" can not be translated to Yarn command`);
+        throw new Error(`npm command "${command} ${options.packages.join(' ')}" can not be translated to Yarn command`);
       } else {
         args.push('install');
       }
@@ -217,7 +217,7 @@ class NpmTask extends Task {
       args.push('remove');
 
     } else {
-      throw new Error(`NPM command "${command}" can not be translated to Yarn command`);
+      throw new Error(`npm command "${command}" can not be translated to Yarn command`);
     }
 
     if (options.verbose) {
diff --git a/lib/tasks/npm-uninstall.js b/lib/tasks/npm-uninstall.js
index cdd4a6931..311cac2a2 100644
--- a/lib/tasks/npm-uninstall.js
+++ b/lib/tasks/npm-uninstall.js
@@ -13,11 +13,11 @@ class NpmUninstallTask extends NpmTask {
   }
 
   formatStartMessage(packages) {
-    return `${this.useYarn ? 'Yarn' : 'NPM'}: Uninstalling ${formatPackageList(packages)} ...`;
+    return `${this.useYarn ? 'Yarn' : 'npm'}: Uninstalling ${formatPackageList(packages)} ...`;
   }
 
   formatCompleteMessage(packages) {
-    return `${this.useYarn ? 'Yarn' : 'NPM'}: Uninstalled ${formatPackageList(packages)}`;
+    return `${this.useYarn ? 'Yarn' : 'npm'}: Uninstalled ${formatPackageList(packages)}`;
   }
 }
 


Test patch:
diff --git a/tests/fixtures/app/npm/README.md b/tests/fixtures/app/npm/README.md
index cd91257af..ab9c24be1 100644
--- a/tests/fixtures/app/npm/README.md
+++ b/tests/fixtures/app/npm/README.md
@@ -8,7 +8,7 @@ A short introduction of this app could easily go here.
 You will need the following things properly installed on your computer.
 
 * [Git](https://git-scm.com/)
-* [Node.js](https://nodejs.org/) (with NPM)
+* [Node.js](https://nodejs.org/) (with npm)
 * [Ember CLI](https://ember-cli.com/)
 * [Google Chrome](https://google.com/chrome/)
 
diff --git a/tests/fixtures/help/help-with-addon.txt b/tests/fixtures/help/help-with-addon.txt
index 9d9e76982..c0eae66c4 100644
--- a/tests/fixtures/help/help-with-addon.txt
+++ b/tests/fixtures/help/help-with-addon.txt
@@ -103,7 +103,7 @@ ember install \u001b[33m<addon-name>\u001b[39m \u001b[36m<options...>\u001b[39m
     \u001b[90maliases: -D\u001b[39m
   \u001b[36m--save-exact\u001b[39m \u001b[36m(Boolean)\u001b[39m \u001b[36m(Default: false)\u001b[39m
     \u001b[90maliases: -E, --exact\u001b[39m
-  \u001b[36m--yarn\u001b[39m \u001b[36m(Boolean)\u001b[39m Use --yarn to enforce yarn usage, or --no-yarn to enforce NPM
+  \u001b[36m--yarn\u001b[39m \u001b[36m(Boolean)\u001b[39m Use --yarn to enforce yarn usage, or --no-yarn to enforce npm
 
 ember new \u001b[33m<app-name>\u001b[39m \u001b[36m<options...>\u001b[39m
   Creates a new directory and runs \u001b[32member init\u001b[39m in it.
diff --git a/tests/fixtures/help/help.js b/tests/fixtures/help/help.js
index 4e76e7951..9481740bd 100644
--- a/tests/fixtures/help/help.js
+++ b/tests/fixtures/help/help.js
@@ -437,7 +437,7 @@ module.exports = {
           name: 'yarn',
           key: 'yarn',
           required: false,
-          description: 'Use --yarn to enforce yarn usage, or --no-yarn to enforce NPM'
+          description: 'Use --yarn to enforce yarn usage, or --no-yarn to enforce npm'
         },
       ],
       anonymousOptions: ['<addon-name>']
diff --git a/tests/fixtures/help/help.txt b/tests/fixtures/help/help.txt
index 84c0bf890..8aef029f2 100644
--- a/tests/fixtures/help/help.txt
+++ b/tests/fixtures/help/help.txt
@@ -103,7 +103,7 @@ ember install \u001b[33m<addon-name>\u001b[39m \u001b[36m<options...>\u001b[39m
     \u001b[90maliases: -D\u001b[39m
   \u001b[36m--save-exact\u001b[39m \u001b[36m(Boolean)\u001b[39m \u001b[36m(Default: false)\u001b[39m
     \u001b[90maliases: -E, --exact\u001b[39m
-  \u001b[36m--yarn\u001b[39m \u001b[36m(Boolean)\u001b[39m Use --yarn to enforce yarn usage, or --no-yarn to enforce NPM
+  \u001b[36m--yarn\u001b[39m \u001b[36m(Boolean)\u001b[39m Use --yarn to enforce yarn usage, or --no-yarn to enforce npm
 
 ember new \u001b[33m<app-name>\u001b[39m \u001b[36m<options...>\u001b[39m
   Creates a new directory and runs \u001b[32member init\u001b[39m in it.
diff --git a/tests/fixtures/help/with-addon-blueprints.js b/tests/fixtures/help/with-addon-blueprints.js
index 065fc9c0f..6443a4d97 100644
--- a/tests/fixtures/help/with-addon-blueprints.js
+++ b/tests/fixtures/help/with-addon-blueprints.js
@@ -469,7 +469,7 @@ module.exports = {
           name: 'yarn',
           key: 'yarn',
           required: false,
-          description: 'Use --yarn to enforce yarn usage, or --no-yarn to enforce NPM'
+          description: 'Use --yarn to enforce yarn usage, or --no-yarn to enforce npm'
         }
       ],
       anonymousOptions: ['<addon-name>']
diff --git a/tests/fixtures/help/with-addon-commands.js b/tests/fixtures/help/with-addon-commands.js
index b75d07bbe..a811188ff 100644
--- a/tests/fixtures/help/with-addon-commands.js
+++ b/tests/fixtures/help/with-addon-commands.js
@@ -437,7 +437,7 @@ module.exports = {
           name: 'yarn',
           key: 'yarn',
           required: false,
-          description: 'Use --yarn to enforce yarn usage, or --no-yarn to enforce NPM'
+          description: 'Use --yarn to enforce yarn usage, or --no-yarn to enforce npm'
         }
       ],
       anonymousOptions: ['<addon-name>']
diff --git a/tests/unit/broccoli/ember-app-test.js b/tests/unit/broccoli/ember-app-test.js
index 4a7ff8ca4..779cbcb44 100644
--- a/tests/unit/broccoli/ember-app-test.js
+++ b/tests/unit/broccoli/ember-app-test.js
@@ -204,13 +204,13 @@ describe('EmberApp', function() {
       });
     });
 
-    describe('ember-resolver NPM vs Bower', function() {
+    describe('ember-resolver npm vs Bower', function() {
       it('does not load ember-resolver.js as bower dep when ember-resolver is present in registry.availablePlugins', function() {
         let app = new EmberApp({ project });
         expect(app.vendorFiles['ember-resolver']).to.equal(undefined);
       });
 
-      it('keeps ember-resolver.js in vendorFiles when NPM ember-resolver is not installed, but is present in bower.json', function() {
+      it('keeps ember-resolver.js in vendorFiles when npm ember-resolver is not installed, but is present in bower.json', function() {
         project.bowerDependencies = function() { return { 'ember': {}, 'ember-resolver': {} }; };
         let app = new EmberApp({
           project,
@@ -222,7 +222,7 @@ describe('EmberApp', function() {
         expect(app.vendorFiles['ember-resolver.js'][0]).to.equal('bower_components/ember-resolver/dist/modules/ember-resolver.js');
       });
 
-      it('removes ember-resolver.js from vendorFiles when not in bower.json and NPM ember-resolver not installed', function() {
+      it('removes ember-resolver.js from vendorFiles when not in bower.json and npm ember-resolver not installed', function() {
         project.bowerDependencies = function() { return { 'ember': {} }; };
         let app = new EmberApp({
           project,