diff --git a/lib/cli/index.js b/lib/cli/index.js
index 554ff500ceb1..92f05aac05a0 100644
--- a/lib/cli/index.js
+++ b/lib/cli/index.js
@@ -8,16 +8,16 @@ module.exports = function (options) {
       if (/version:/.test(string) || /warning:/.test(string)) {
         return;
       }
-      string = string.replace(/ember-cli/g, 'angular-cli');
-      string = string.replace(/ember/g, 'ng');
+      string = string.replace(/ember-cli(?!.com)/g, 'angular-cli');
+      string = string.replace(/ember(?!-cli.com)/g, 'ng');
       write.apply(process.stdout, arguments)
     }
   })(process.stdout.write);
 
   process.stderr.write = (function(write) {
     return function(string, encoding, fd) {
-      string = string.replace(/ember-cli/g, 'angular-cli');
-      string = string.replace(/ember/g, 'ng');
+      string = string.replace(/ember-cli(?!.com)/g, 'angular-cli');
+      string = string.replace(/ember(?!-cli.com)/g, 'ng');
       write.apply(process.stdout, arguments)
     }
   })(process.stderr.write);