diff --git a/aio/content/examples/ajs-quick-reference/e2e/src/app.e2e-spec.ts b/aio/content/examples/ajs-quick-reference/e2e/src/app.e2e-spec.ts
index e27f56e68b..0eef85ffde 100644
--- a/aio/content/examples/ajs-quick-reference/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/ajs-quick-reference/e2e/src/app.e2e-spec.ts
@@ -67,8 +67,8 @@ describe('AngularJS to Angular Quick Reference Tests', function () {
     testFavoriteHero('Magneta', 'No movie, sorry!');
   });
 
-  it('should display a movie for Mr. Nice', function () {
-    testFavoriteHero('Mr. Nice', 'Excellent choice!');
+  it('should display a movie for Dr Nice', function () {
+    testFavoriteHero('Dr Nice', 'Excellent choice!');
   });
 
   function testImagesAreDisplayed(isDisplayed: boolean) {
diff --git a/aio/content/examples/ajs-quick-reference/src/app/movie.service.ts b/aio/content/examples/ajs-quick-reference/src/app/movie.service.ts
index 887774d570..f74e606544 100644
--- a/aio/content/examples/ajs-quick-reference/src/app/movie.service.ts
+++ b/aio/content/examples/ajs-quick-reference/src/app/movie.service.ts
@@ -18,12 +18,12 @@ export class MovieService {
         approvalRating: .97
       },
       {
-        hero: 'Mr. Nice',
+        hero: 'Dr Nice',
         imageurl: 'assets/images/villain.png',
         movieId: 2,
         mpaa: 'pg-13',
         releaseDate: '2015-12-18T00:00:00',
-        title: 'No More Mr. Nice Guy',
+        title: 'No More Dr Nice',
         price: 14.95,
         starRating: 4.6,
         approvalRating: .94
diff --git a/aio/content/examples/animations/src/app/mock-heroes.ts b/aio/content/examples/animations/src/app/mock-heroes.ts
index 1771a7103b..cd3506f574 100644
--- a/aio/content/examples/animations/src/app/mock-heroes.ts
+++ b/aio/content/examples/animations/src/app/mock-heroes.ts
@@ -2,7 +2,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/architecture/e2e/src/app.e2e-spec.ts b/aio/content/examples/architecture/e2e/src/app.e2e-spec.ts
index 8ad5c9ab74..6dbc6952b8 100644
--- a/aio/content/examples/architecture/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/architecture/e2e/src/app.e2e-spec.ts
@@ -31,7 +31,7 @@ describe('Architecture', () => {
 
 function heroTests() {
 
-  const targetHero: Hero = { id: 2, name: 'Mr. Nice' };
+  const targetHero: Hero = { id: 2, name: 'Dr Nice' };
 
   it('has the right number of heroes', () => {
     let page = getPageElts();
diff --git a/aio/content/examples/architecture/src/app/backend.service.ts b/aio/content/examples/architecture/src/app/backend.service.ts
index c05a8fcb8a..145be4cad5 100644
--- a/aio/content/examples/architecture/src/app/backend.service.ts
+++ b/aio/content/examples/architecture/src/app/backend.service.ts
@@ -5,7 +5,7 @@ import { Hero } from './hero';
 
 const HEROES = [
         new Hero('Windstorm', 'Weather mastery'),
-        new Hero('Mr. Nice', 'Killing them with kindness'),
+        new Hero('Dr Nice', 'Killing them with kindness'),
         new Hero('Magneta', 'Manipulates metallic objects')
       ];
 
diff --git a/aio/content/examples/component-interaction/e2e/src/app.e2e-spec.ts b/aio/content/examples/component-interaction/e2e/src/app.e2e-spec.ts
index 7637a6affc..abc8ecf765 100644
--- a/aio/content/examples/component-interaction/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/component-interaction/e2e/src/app.e2e-spec.ts
@@ -13,7 +13,7 @@ describe('Component Communication Cookbook Tests', function () {
   describe('Parent-to-child communication', function() {
     // #docregion parent-to-child
     // ...
-    let _heroNames = ['Mr. IQ', 'Magneta', 'Bombasto'];
+    let _heroNames = ['Dr IQ', 'Magneta', 'Bombasto'];
     let _masterName = 'Master';
 
     it('should pass properties to children properly', function () {
@@ -36,7 +36,7 @@ describe('Component Communication Cookbook Tests', function () {
     // ...
     it('should display trimmed, non-empty names', function () {
       let _nonEmptyNameIndex = 0;
-      let _nonEmptyName = '"Mr. IQ"';
+      let _nonEmptyName = '"Dr IQ"';
       let parent = element.all(by.tagName('app-name-parent')).get(0);
       let hero = parent.all(by.tagName('app-name-child')).get(_nonEmptyNameIndex);
 
diff --git a/aio/content/examples/component-interaction/src/app/hero.ts b/aio/content/examples/component-interaction/src/app/hero.ts
index a7b70f48e8..3e80ad51c2 100644
--- a/aio/content/examples/component-interaction/src/app/hero.ts
+++ b/aio/content/examples/component-interaction/src/app/hero.ts
@@ -3,7 +3,7 @@ export class Hero {
 }
 
 export const HEROES = [
-  {name: 'Mr. IQ'},
+  {name: 'Dr IQ'},
   {name: 'Magneta'},
   {name: 'Bombasto'}
 ];
diff --git a/aio/content/examples/component-interaction/src/app/name-parent.component.ts b/aio/content/examples/component-interaction/src/app/name-parent.component.ts
index 2c8c23b781..747fbea166 100644
--- a/aio/content/examples/component-interaction/src/app/name-parent.component.ts
+++ b/aio/content/examples/component-interaction/src/app/name-parent.component.ts
@@ -9,7 +9,7 @@ import { Component } from '@angular/core';
   `
 })
 export class NameParentComponent {
-  // Displays 'Mr. IQ', '<no name set>', 'Bombasto'
-  names = ['Mr. IQ', '   ', '  Bombasto  '];
+  // Displays 'Dr IQ', '<no name set>', 'Bombasto'
+  names = ['Dr IQ', '   ', '  Bombasto  '];
 }
 // #enddocregion
diff --git a/aio/content/examples/component-interaction/src/app/votetaker.component.ts b/aio/content/examples/component-interaction/src/app/votetaker.component.ts
index d553af0d7b..7b3de1059b 100644
--- a/aio/content/examples/component-interaction/src/app/votetaker.component.ts
+++ b/aio/content/examples/component-interaction/src/app/votetaker.component.ts
@@ -15,7 +15,7 @@ import { Component }      from '@angular/core';
 export class VoteTakerComponent {
   agreed = 0;
   disagreed = 0;
-  voters = ['Mr. IQ', 'Ms. Universe', 'Bombasto'];
+  voters = ['Narco', 'Celeritas', 'Bombasto'];
 
   onVoted(agreed: boolean) {
     agreed ? this.agreed++ : this.disagreed++;
diff --git a/aio/content/examples/dependency-injection-in-action/e2e/src/app.e2e-spec.ts b/aio/content/examples/dependency-injection-in-action/e2e/src/app.e2e-spec.ts
index 00dd11868c..4d611f5698 100644
--- a/aio/content/examples/dependency-injection-in-action/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/dependency-injection-in-action/e2e/src/app.e2e-spec.ts
@@ -23,8 +23,8 @@ describe('Dependency Injection Cookbook', function () {
       expect(sortedHeroes).toBeDefined();
     });
 
-    it('Mr. Nice should be in sorted heroes', function () {
-      let sortedHero = element.all(by.xpath('//sorted-heroes/[text()="Mr. Nice" and position()=2]')).get(0);
+    it('Dr Nice should be in sorted heroes', function () {
+      let sortedHero = element.all(by.xpath('//sorted-heroes/[text()="Dr Nice" and position()=2]')).get(0);
       expect(sortedHero).toBeDefined();
     });
 
@@ -60,7 +60,7 @@ describe('Dependency Injection Cookbook', function () {
 
     it('should render Hero-of-the-Month runner-ups', function () {
       let runnersUp =  element(by.id('rups1')).getText();
-      expect(runnersUp).toContain('RubberMan, Mr. Nice');
+      expect(runnersUp).toContain('RubberMan, Dr Nice');
     });
 
     it('should render DateLogger log entry in Hero-of-the-Month', function () {
diff --git a/aio/content/examples/dependency-injection-in-action/src/app/hero.service.ts b/aio/content/examples/dependency-injection-in-action/src/app/hero.service.ts
index 44db98ee7a..369e2be532 100644
--- a/aio/content/examples/dependency-injection-in-action/src/app/hero.service.ts
+++ b/aio/content/examples/dependency-injection-in-action/src/app/hero.service.ts
@@ -11,7 +11,7 @@ export class HeroService {
   private heroes: Array<Hero> = [
     new Hero(1, 'RubberMan', 'Hero of many talents', '123-456-7899'),
     new Hero(2, 'Magma', 'Hero of all trades', '555-555-5555'),
-    new Hero(3, 'Mr. Nice', 'The name says it all', '111-222-3333')
+    new Hero(3, 'Dr Nice', 'The name says it all', '111-222-3333')
  ];
 
   getHeroById(id: number): Hero {
diff --git a/aio/content/examples/dependency-injection-in-action/src/app/storage.component.ts b/aio/content/examples/dependency-injection-in-action/src/app/storage.component.ts
index d0fb0ca54e..4dc074fd8f 100644
--- a/aio/content/examples/dependency-injection-in-action/src/app/storage.component.ts
+++ b/aio/content/examples/dependency-injection-in-action/src/app/storage.component.ts
@@ -29,10 +29,10 @@ export class StorageComponent implements OnInit {
   }
 
   setSession() {
-    this.sessionStorageService.set('hero', 'Mr. Nice - Session');
+    this.sessionStorageService.set('hero', 'Dr Nice - Session');
   }
 
   setLocal() {
-    this.localStorageService.set('hero', 'Mr. Nice - Local');
+    this.localStorageService.set('hero', 'Dr Nice - Local');
   }
 }
diff --git a/aio/content/examples/dependency-injection/e2e/src/app.e2e-spec.ts b/aio/content/examples/dependency-injection/e2e/src/app.e2e-spec.ts
index 12fe6ae474..00bf3a9d0a 100644
--- a/aio/content/examples/dependency-injection/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/dependency-injection/e2e/src/app.e2e-spec.ts
@@ -56,7 +56,7 @@ describe('Dependency Injection Tests', function () {
     });
 
     it('Hero displays as expected', function () {
-      expectedMsg = 'Mr. Nice';
+      expectedMsg = 'Dr Nice';
       expect(element(by.css('#hero')).getText()).toEqual(expectedMsg);
     });
 
diff --git a/aio/content/examples/dependency-injection/src/app/heroes/mock-heroes.ts b/aio/content/examples/dependency-injection/src/app/heroes/mock-heroes.ts
index a836faa1bd..61122b9fb2 100644
--- a/aio/content/examples/dependency-injection/src/app/heroes/mock-heroes.ts
+++ b/aio/content/examples/dependency-injection/src/app/heroes/mock-heroes.ts
@@ -2,7 +2,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, isSecret: false, name: 'Mr. Nice' },
+  { id: 11, isSecret: false, name: 'Dr Nice' },
   { id: 12, isSecret: false, name: 'Narco' },
   { id: 13, isSecret: false, name: 'Bombasto' },
   { id: 14, isSecret: false, name: 'Celeritas' },
diff --git a/aio/content/examples/docs-style-guide/src/app/hero.ts b/aio/content/examples/docs-style-guide/src/app/hero.ts
index fadbdbf9ed..e1fc2f4fa9 100644
--- a/aio/content/examples/docs-style-guide/src/app/hero.ts
+++ b/aio/content/examples/docs-style-guide/src/app/hero.ts
@@ -4,7 +4,7 @@ export class Hero {
 }
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' }
diff --git a/aio/content/examples/http/e2e/src/app.e2e-spec.ts b/aio/content/examples/http/e2e/src/app.e2e-spec.ts
index 9baf2cdc65..091e54acaa 100644
--- a/aio/content/examples/http/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/http/e2e/src/app.e2e-spec.ts
@@ -36,7 +36,7 @@ describe('Http Tests', function() {
   describe('Heroes', () => {
     it('retrieves the list of heroes at startup', () => {
       expect(page.heroesListItems.count()).toBe(4);
-      expect(page.heroesListItems.get(0).getText()).toContain('Mr. Nice');
+      expect(page.heroesListItems.get(0).getText()).toContain('Dr Nice');
       checkLogForMessage('GET "api/heroes"');
     });
 
diff --git a/aio/content/examples/http/src/app/in-memory-data.service.ts b/aio/content/examples/http/src/app/in-memory-data.service.ts
index 606e77f8f5..c74fb2626e 100644
--- a/aio/content/examples/http/src/app/in-memory-data.service.ts
+++ b/aio/content/examples/http/src/app/in-memory-data.service.ts
@@ -3,7 +3,7 @@ import { InMemoryDbService } from 'angular-in-memory-web-api';
 export class InMemoryDataService implements InMemoryDbService {
   createDb() {
     const heroes = [
-      { id: 11, name: 'Mr. Nice' },
+      { id: 11, name: 'Dr Nice' },
       { id: 12, name: 'Narco' },
       { id: 13, name: 'Bombasto' },
       { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/ngcontainer/src/app/hero.ts b/aio/content/examples/ngcontainer/src/app/hero.ts
index 28b435252d..8619853380 100644
--- a/aio/content/examples/ngcontainer/src/app/hero.ts
+++ b/aio/content/examples/ngcontainer/src/app/hero.ts
@@ -6,7 +6,7 @@ export class Hero {
 }
 
 export const heroes: Hero[] = [
-  { id: 1, name: 'Mr. Nice', emotion: 'happy' },
+  { id: 1, name: 'Dr Nice', emotion: 'happy' },
   { id: 2, name: 'Narco', emotion: 'sad' },
   { id: 3, name: 'Windstorm', emotion: 'confused' },
   { id: 4, name: 'Magneta' }
diff --git a/aio/content/examples/router/src/app/heroes/mock-heroes.ts b/aio/content/examples/router/src/app/heroes/mock-heroes.ts
index e84c2fd2b0..27ed1ffbff 100644
--- a/aio/content/examples/router/src/app/heroes/mock-heroes.ts
+++ b/aio/content/examples/router/src/app/heroes/mock-heroes.ts
@@ -1,7 +1,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/structural-directives/e2e/src/app.e2e-spec.ts b/aio/content/examples/structural-directives/e2e/src/app.e2e-spec.ts
index a877fb3223..9023c4ea89 100644
--- a/aio/content/examples/structural-directives/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/structural-directives/e2e/src/app.e2e-spec.ts
@@ -10,12 +10,12 @@ describe('Structural Directives', function () {
 
   it('first div should show hero name with *ngIf', function () {
     const allDivs = element.all(by.tagName('div'));
-    expect(allDivs.get(0).getText()).toEqual('Mr. Nice');
+    expect(allDivs.get(0).getText()).toEqual('Dr Nice');
   });
 
   it('first li should show hero name with *ngFor', function () {
     const allLis = element.all(by.tagName('li'));
-    expect(allLis.get(0).getText()).toEqual('Mr. Nice');
+    expect(allLis.get(0).getText()).toEqual('Dr Nice');
   });
 
   it('ngSwitch have two <happy-hero> instances', function () {
diff --git a/aio/content/examples/structural-directives/src/app/hero.ts b/aio/content/examples/structural-directives/src/app/hero.ts
index 89f0cbfdf8..4056351495 100644
--- a/aio/content/examples/structural-directives/src/app/hero.ts
+++ b/aio/content/examples/structural-directives/src/app/hero.ts
@@ -6,7 +6,7 @@ export class Hero {
 }
 
 export const heroes: Hero[] = [
-  { id: 1, name: 'Mr. Nice',  emotion: 'happy'},
+  { id: 1, name: 'Dr Nice',  emotion: 'happy'},
   { id: 2, name: 'Narco',     emotion: 'sad' },
   { id: 3, name: 'Windstorm', emotion: 'confused' },
   { id: 4, name: 'Magneta'}
diff --git a/aio/content/examples/template-syntax/src/app/hero.ts b/aio/content/examples/template-syntax/src/app/hero.ts
index f8cc3b16a6..612c1035cb 100644
--- a/aio/content/examples/template-syntax/src/app/hero.ts
+++ b/aio/content/examples/template-syntax/src/app/hero.ts
@@ -10,7 +10,7 @@ export class Hero {
       'http://www.imdb.com/title/tt0065832/',
       325
     ),
-    new Hero(1, 'Mr. Nice',  'happy'),
+    new Hero(1, 'Dr Nice',  'happy'),
     new Hero(2, 'Narco',     'sad' ),
     new Hero(3, 'Windstorm', 'confused' ),
     new Hero(4, 'Magneta')
diff --git a/aio/content/examples/testing/src/app/in-memory-data.service.ts b/aio/content/examples/testing/src/app/in-memory-data.service.ts
index 81f26b674a..d3827fcd2b 100644
--- a/aio/content/examples/testing/src/app/in-memory-data.service.ts
+++ b/aio/content/examples/testing/src/app/in-memory-data.service.ts
@@ -9,7 +9,7 @@ const maxQuotes = Infinity; // 0;
 export class InMemoryDataService implements InMemoryDbService {
   createDb() {
     const heroes = [
-      { id: 11, name: 'Mr. Nice' },
+      { id: 11, name: 'Dr Nice' },
       { id: 12, name: 'Narco' },
       { id: 13, name: 'Bombasto' },
       { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/toh-pt2/src/app/mock-heroes.ts b/aio/content/examples/toh-pt2/src/app/mock-heroes.ts
index e84c2fd2b0..27ed1ffbff 100644
--- a/aio/content/examples/toh-pt2/src/app/mock-heroes.ts
+++ b/aio/content/examples/toh-pt2/src/app/mock-heroes.ts
@@ -1,7 +1,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/toh-pt3/src/app/mock-heroes.ts b/aio/content/examples/toh-pt3/src/app/mock-heroes.ts
index e84c2fd2b0..27ed1ffbff 100644
--- a/aio/content/examples/toh-pt3/src/app/mock-heroes.ts
+++ b/aio/content/examples/toh-pt3/src/app/mock-heroes.ts
@@ -1,7 +1,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/toh-pt4/src/app/mock-heroes.ts b/aio/content/examples/toh-pt4/src/app/mock-heroes.ts
index 1771a7103b..cd3506f574 100644
--- a/aio/content/examples/toh-pt4/src/app/mock-heroes.ts
+++ b/aio/content/examples/toh-pt4/src/app/mock-heroes.ts
@@ -2,7 +2,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/toh-pt5/src/app/mock-heroes.ts b/aio/content/examples/toh-pt5/src/app/mock-heroes.ts
index 1771a7103b..cd3506f574 100644
--- a/aio/content/examples/toh-pt5/src/app/mock-heroes.ts
+++ b/aio/content/examples/toh-pt5/src/app/mock-heroes.ts
@@ -2,7 +2,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/toh-pt6/src/app/in-memory-data.service.ts b/aio/content/examples/toh-pt6/src/app/in-memory-data.service.ts
index c590be5d65..cb95d5eae5 100644
--- a/aio/content/examples/toh-pt6/src/app/in-memory-data.service.ts
+++ b/aio/content/examples/toh-pt6/src/app/in-memory-data.service.ts
@@ -9,7 +9,7 @@ import { Injectable } from '@angular/core';
 export class InMemoryDataService implements InMemoryDbService {
   createDb() {
     const heroes = [
-      { id: 11, name: 'Mr. Nice' },
+      { id: 11, name: 'Dr Nice' },
       { id: 12, name: 'Narco' },
       { id: 13, name: 'Bombasto' },
       { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/toh-pt6/src/app/mock-heroes.ts b/aio/content/examples/toh-pt6/src/app/mock-heroes.ts
index 1771a7103b..cd3506f574 100644
--- a/aio/content/examples/toh-pt6/src/app/mock-heroes.ts
+++ b/aio/content/examples/toh-pt6/src/app/mock-heroes.ts
@@ -2,7 +2,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/universal/src/app/in-memory-data.service.ts b/aio/content/examples/universal/src/app/in-memory-data.service.ts
index ff1f190f83..b23507887e 100644
--- a/aio/content/examples/universal/src/app/in-memory-data.service.ts
+++ b/aio/content/examples/universal/src/app/in-memory-data.service.ts
@@ -3,7 +3,7 @@ import { InMemoryDbService } from 'angular-in-memory-web-api';
 export class InMemoryDataService implements InMemoryDbService {
   createDb() {
     const heroes = [
-      { id: 11, name: 'Mr. Nice' },
+      { id: 11, name: 'Dr Nice' },
       { id: 12, name: 'Narco' },
       { id: 13, name: 'Bombasto' },
       { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/universal/src/app/mock-heroes.ts b/aio/content/examples/universal/src/app/mock-heroes.ts
index e84c2fd2b0..27ed1ffbff 100644
--- a/aio/content/examples/universal/src/app/mock-heroes.ts
+++ b/aio/content/examples/universal/src/app/mock-heroes.ts
@@ -1,7 +1,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' },
diff --git a/aio/content/tutorial/toh-pt5.md b/aio/content/tutorial/toh-pt5.md
index 4931ae01ef..cab0614f2d 100644
--- a/aio/content/tutorial/toh-pt5.md
+++ b/aio/content/tutorial/toh-pt5.md
@@ -475,7 +475,7 @@ The browser refreshes and the app is working again.
 You can click a hero in the dashboard or in the heroes list and navigate to that hero's detail view.
 
 If you paste `localhost:4200/detail/11` in the browser address bar,
-the router navigates to the detail view for the hero with `id: 11`,  "Mr. Nice".
+the router navigates to the detail view for the hero with `id: 11`,  "Dr Nice".
 
 {@a goback}
 
diff --git a/packages/compiler-cli/test/metadata/collector_spec.ts b/packages/compiler-cli/test/metadata/collector_spec.ts
index e48d686cf3..5e0b7cec2c 100644
--- a/packages/compiler-cli/test/metadata/collector_spec.ts
+++ b/packages/compiler-cli/test/metadata/collector_spec.ts
@@ -243,7 +243,7 @@ describe('Collector', () => {
       version: METADATA_VERSION,
       metadata: {
         HEROES: [
-          {'id': 11, 'name': 'Mr. Nice', '$quoted$': ['id', 'name']},
+          {'id': 11, 'name': 'Dr Nice', '$quoted$': ['id', 'name']},
           {'id': 12, 'name': 'Narco', '$quoted$': ['id', 'name']},
           {'id': 13, 'name': 'Bombasto', '$quoted$': ['id', 'name']},
           {'id': 14, 'name': 'Celeritas', '$quoted$': ['id', 'name']},
@@ -1221,7 +1221,7 @@ const FILES: Directory = {
       import {Hero as Hero} from './hero';
 
       export const HEROES: Hero[] = [
-          {"id": 11, "name": "Mr. Nice"},
+          {"id": 11, "name": "Dr Nice"},
           {"id": 12, "name": "Narco"},
           {"id": 13, "name": "Bombasto"},
           {"id": 14, "name": "Celeritas"},