diff --git a/lib/cli/index.js b/lib/cli/index.js
index ed6dde37ec58..7b5280cee349 100644
--- a/lib/cli/index.js
+++ b/lib/cli/index.js
@@ -17,7 +17,7 @@ module.exports = function(options) {
       return oldStdoutWrite.apply(process.stdout, arguments);
     }
     line = line.replace(/ember-cli(?!.com)/g, 'angular-cli')
-      .replace(/ember(?!-cli.com)/g, 'ng');
+      .replace(/\bember\b(?!-cli.com)/g, 'ng');
     return oldStdoutWrite.apply(process.stdout, arguments);
   };
 
@@ -25,7 +25,7 @@ module.exports = function(options) {
   process.stderr.write = function (line) {
     line = line.toString()
       .replace(/ember-cli(?!.com)/g, 'angular-cli')
-      .replace(/ember(?!-cli.com)/g, 'ng');
+      .replace(/\bember\b(?!-cli.com)/g, 'ng');
     return oldStderrWrite.apply(process.stdout, arguments);
   };