From 93516ea8a12374e801ccb485652c76e14e437db4 Mon Sep 17 00:00:00 2001
From: Ward Bell <wardbell@hotmail.com>
Date: Fri, 21 Apr 2017 17:21:45 -0700
Subject: [PATCH] docs(aio): rename cb- files and a few others

---
 aio/content/examples/.gitignore               |   8 +-
 .../e2e-spec.ts                               |   0
 .../example-config.json                       |   0
 .../plnkr.json                                |   0
 .../src/app/app-routing.module.ts             |   0
 .../src/app/app.component.css                 |   0
 .../src/app/app.component.html                |   0
 .../src/app/app.component.ts                  |   0
 .../src/app/app.module.1.ts                   |   0
 .../src/app/app.module.ts                     |   0
 .../src/app/date.pipe.ts                      |   0
 .../src/app/movie-list.component.css          |   0
 .../src/app/movie-list.component.html         |   0
 .../src/app/movie-list.component.ts           |   0
 .../src/app/movie.service.ts                  |   0
 .../src/app/movie.ts                          |   0
 .../src/images/hero.png                       | Bin
 .../src/images/ng-logo.png                    | Bin
 .../src/images/villain.png                    | Bin
 .../src/index.html                            |   0
 .../src/main.ts                               |   0
 .../.gitignore                                |   0
 .../e2e-spec.ts                               |   0
 .../example-config.json                       |   0
 .../rollup-config.js                          |   0
 .../src/app/app.component.html                |   0
 .../src/app/app.component.ts                  |   0
 .../src/app/app.module.ts                     |   0
 .../src/index-jit.html                        |   0
 .../src/index.html                            |   0
 .../src/main-jit.ts                           |   0
 .../src/main.ts                               |   0
 .../tsconfig-aot.json                         |   0
 .../.gitignore                                |   0
 .../e2e-spec.ts                               |   0
 .../example-config.json                       |   0
 .../plnkr.json                                |   0
 .../src/app/app.component.html                |   0
 .../src/app/app.component.ts                  |   0
 .../src/app/app.module.ts                     |   0
 .../src/app/astronaut.component.ts            |   0
 .../src/app/countdown-parent.component.ts     |   0
 .../src/app/countdown-timer.component.ts      |   0
 .../src/app/hero-child.component.ts           |   0
 .../src/app/hero-parent.component.ts          |   0
 .../src/app/hero.ts                           |   0
 .../src/app/mission.service.ts                |   0
 .../src/app/missioncontrol.component.ts       |   0
 .../src/app/name-child.component.ts           |   0
 .../src/app/name-parent.component.ts          |   0
 .../src/app/version-child.component.ts        |   0
 .../src/app/version-parent.component.ts       |   0
 .../src/app/voter.component.ts                |   0
 .../src/app/votetaker.component.ts            |   0
 .../src/demo.css                              |   0
 .../src/index.html                            |   0
 .../src/main.ts                               |   0
 .../e2e-spec.ts                               |   0
 .../example-config.json                       |   0
 .../plnkr.json                                |   0
 .../src/app/app-routing.module.ts             |   0
 .../src/app/app.component.html                |   0
 .../src/app/app.component.ts                  |   0
 .../src/app/app.module.ts                     |   0
 .../src/app/date-logger.service.ts            |   0
 .../src/app/hero-bio.component.ts             |   0
 .../src/app/hero-bios.component.ts            |   0
 .../src/app/hero-cache.service.ts             |   0
 .../src/app/hero-contact.component.ts         |   0
 .../src/app/hero-data.ts                      |   0
 .../src/app/hero-of-the-month.component.1.ts  |   0
 .../src/app/hero-of-the-month.component.html  |   0
 .../src/app/hero-of-the-month.component.ts    |   0
 .../src/app/hero.service.ts                   |   0
 .../src/app/hero.ts                           |   0
 .../src/app/highlight.directive.ts            |   0
 .../src/app/logger.service.ts                 |   0
 .../src/app/minimal-logger.service.ts         |   0
 .../src/app/parent-finder.component.ts        |   0
 .../src/app/runners-up.ts                     |   0
 .../src/app/sorted-heroes.component.ts        |   0
 .../src/app/user-context.service.ts           |   0
 .../src/app/user.service.ts                   |   0
 .../src/index.html                            |   0
 .../src/main.ts                               |   0
 .../src/sample.css                            |   0
 .../e2e-spec.ts                               |   0
 .../example-config.json                       |   0
 .../plnkr.json                                |   0
 .../src/app/ad-banner.component.ts            |   0
 .../src/app/ad-item.ts                        |   0
 .../src/app/ad.component.ts                   |   0
 .../src/app/ad.directive.ts                   |   0
 .../src/app/ad.service.ts                     |   0
 .../src/app/app.component.ts                  |   0
 .../src/app/app.module.ts                     |   0
 .../src/app/hero-job-ad.component.ts          |   0
 .../src/app/hero-profile.component.ts         |   0
 .../src/index.html                            |   0
 .../src/main.ts                               |   0
 .../src/sample.css                            |   0
 .../e2e-spec.ts                               |   0
 .../example-config.json                       |   0
 .../plnkr.json                                |   0
 .../src/app/app.component.ts                  |   0
 .../src/app/app.module.ts                     |   0
 .../app/dynamic-form-question.component.html  |   0
 .../app/dynamic-form-question.component.ts    |   0
 .../src/app/dynamic-form.component.html       |   0
 .../src/app/dynamic-form.component.ts         |   0
 .../src/app/question-base.ts                  |   0
 .../src/app/question-control.service.ts       |   0
 .../src/app/question-dropdown.ts              |   0
 .../src/app/question-textbox.ts               |   0
 .../src/app/question.service.ts               |   0
 .../src/index.html                            |   0
 .../src/main.ts                               |   0
 .../src/sample.css                            |   0
 .../e2e-spec.ts                               |   0
 .../example-config.json                       |   0
 .../plnkr.json                                |   0
 .../src/app/app.component.ts                  |   0
 .../src/app/app.module.ts                     |   0
 .../hero-form-reactive.component.html         |   0
 .../reactive/hero-form-reactive.component.ts  |   0
 .../app/reactive/hero-form-reactive.module.ts |   0
 .../app/shared/forbidden-name.directive.ts    |   0
 .../src/app/shared/hero.ts                    |   0
 .../src/app/shared/shared.module.ts           |   0
 .../src/app/shared/submitted.component.ts     |   0
 .../app/template/hero-form-template.module.ts |   0
 .../hero-form-template1.component.html        |   0
 .../template/hero-form-template1.component.ts |   0
 .../hero-form-template2.component.html        |   0
 .../template/hero-form-template2.component.ts |   0
 .../src/forms.css                             |   0
 .../src/index.html                            |   0
 .../src/main.ts                               |   0
 .../examples/{cb-i18n => i18n}/.gitignore     |   0
 .../examples/{cb-i18n => i18n}/e2e-spec.ts    |   0
 .../{cb-i18n => i18n}/example-config.json     |   0
 .../examples/{cb-i18n => i18n}/messages.xlf   |   0
 .../examples/{cb-i18n => i18n}/plnkr.json     |   0
 .../src/app/app.component.1.html              |   0
 .../src/app/app.component.html                |   0
 .../src/app/app.component.ts                  |   0
 .../{cb-i18n => i18n}/src/app/app.module.ts   |   0
 .../src/app/i18n-providers.ts                 |   0
 .../examples/{cb-i18n => i18n}/src/index.html |   0
 .../src/locale/messages.es.xlf                |   0
 .../src/locale/messages.es.xlf.html           |   0
 .../examples/{cb-i18n => i18n}/src/main.1.ts  |   0
 .../examples/{cb-i18n => i18n}/src/main.ts    |   0
 .../src/systemjs-text-plugin.js               |   0
 .../e2e-spec.ts                               |   3 +-
 .../example-config.json                       |   0
 .../plnkr.json                                |   0
 .../src/app/app.component.ts                  |   0
 .../src/app/app.module.ts                     |   0
 .../src/index.html                            |   0
 .../src/main.ts                               |   0
 .../{style-guide => styleguide}/.gitignore    |   0
 .../{style-guide => styleguide}/e2e-spec.ts   |   0
 .../ts => styleguide}/example-config.json     |   0
 .../{style-guide => styleguide}/plnkr.json    |   0
 .../src/01-01/app/app.component.css           |   0
 .../src/01-01/app/app.component.ts            |   0
 .../src/01-01/app/app.module.ts               |   0
 .../01-01/app/heroes/hero.component.avoid.ts  |   0
 .../src/01-01/app/heroes/heroes.component.ts  |   0
 .../src/01-01/app/heroes/index.ts             |   0
 .../src/01-01/app/heroes/shared/hero.model.ts |   0
 .../01-01/app/heroes/shared/hero.service.ts   |   0
 .../src/01-01/app/heroes/shared/index.ts      |   0
 .../01-01/app/heroes/shared/mock-heroes.ts    |   0
 .../src/01-01/app/index.ts                    |   0
 .../src/01-01/main.ts                         |   0
 .../src/02-05/app/app.component.ts            |   0
 .../src/02-05/app/app.module.ts               |   0
 .../src/02-05/main.ts                         |   0
 .../src/02-07/app/app.component.ts            |   0
 .../src/02-07/app/app.module.ts               |   0
 .../02-07/app/heroes/hero.component.avoid.ts  |   0
 .../src/02-07/app/heroes/hero.component.ts    |   0
 .../src/02-07/app/heroes/index.ts             |   0
 .../src/02-07/app/index.ts                    |   0
 .../src/02-07/app/users/index.ts              |   0
 .../02-07/app/users/users.component.avoid.ts  |   0
 .../src/02-07/app/users/users.component.ts    |   0
 .../src/02-08/app/app.component.ts            |   0
 .../src/02-08/app/app.module.ts               |   0
 .../src/02-08/app/index.ts                    |   0
 .../src/02-08/app/shared/index.ts             |   0
 .../app/shared/input-highlight.directive.ts   |   0
 .../app/shared/validate.directive.avoid.ts    |   0
 .../02-08/app/shared/validate.directive.ts    |   0
 .../src/03-01/app/app.component.ts            |   0
 .../src/03-01/app/app.module.ts               |   0
 .../03-01/app/core/exception.service.avoid.ts |   0
 .../src/03-01/app/core/exception.service.ts   |   0
 .../src/03-01/app/core/index.ts               |   0
 .../src/03-01/app/index.ts                    |   0
 .../src/03-02/app/app.component.ts            |   0
 .../src/03-02/app/app.module.ts               |   0
 .../src/03-02/app/core/data.service.ts        |   0
 .../src/03-02/app/core/index.ts               |   0
 .../src/03-02/app/index.ts                    |   0
 .../src/03-03/app/app.component.ts            |   0
 .../src/03-03/app/app.module.ts               |   0
 .../app/core/hero-collector.service.avoid.ts  |   0
 .../03-03/app/core/hero-collector.service.ts  |   0
 .../src/03-03/app/core/hero.model.avoid.ts    |   0
 .../src/03-03/app/core/hero.model.ts          |   0
 .../src/03-03/app/core/index.ts               |   0
 .../src/03-03/app/index.ts                    |   0
 .../src/03-04/app/app.component.ts            |   2 +-
 .../src/03-04/app/app.module.ts               |   0
 .../src/03-04/app/core/index.ts               |   0
 .../src/03-04/app/core/toast.service.avoid.ts |   0
 .../src/03-04/app/core/toast.service.ts       |   0
 .../src/03-04/app/index.ts                    |   0
 .../src/03-06/app/app.component.html          |   0
 .../src/03-06/app/app.component.ts            |   0
 .../src/03-06/app/app.module.ts               |   0
 .../src/03-06/app/core/exception.service.ts   |   0
 .../src/03-06/app/core/index.ts               |   0
 .../src/03-06/app/core/spinner/index.ts       |   0
 .../app/core/spinner/spinner.component.ts     |   0
 .../03-06/app/core/spinner/spinner.service.ts |   0
 .../src/03-06/app/core/toast/index.ts         |   0
 .../03-06/app/core/toast/toast.component.ts   |   0
 .../src/03-06/app/core/toast/toast.service.ts |   0
 .../src/03-06/app/heroes/index.ts             |   0
 .../src/03-06/app/heroes/shared/hero.model.ts |   0
 .../app/heroes/shared/hero.service.avoid.ts   |   0
 .../03-06/app/heroes/shared/hero.service.ts   |   0
 .../src/03-06/app/heroes/shared/index.ts      |   0
 .../src/03-06/app/index.ts                    |   0
 .../03-06/app/shared/toast/toast.component.ts |   0
 .../src/04-08/app/app.component.ts            |   0
 .../src/04-08/app/app.module.ts               |   0
 .../04-08/app/heroes/heroes.component.html    |   0
 .../src/04-08/app/heroes/heroes.component.ts  |   0
 .../src/04-10/app/app.component.ts            |   0
 .../src/04-10/app/app.module.ts               |   0
 .../04-10/app/heroes/heroes.component.html    |   0
 .../src/04-10/app/heroes/heroes.component.ts  |   0
 .../filter-text/filter-text.component.ts      |   0
 .../shared/filter-text/filter-text.service.ts |   0
 .../src/04-10/app/shared/init-caps.pipe.ts    |   0
 .../src/04-10/app/shared/shared.module.ts     |   0
 .../src/04-11/app/app.component.ts            |   0
 .../src/04-11/app/app.module.ts               |   0
 .../src/04-11/app/core/core.module.ts         |   0
 .../src/04-11/app/core/index.ts               |   0
 .../src/04-11/app/core/logger.service.ts      |   0
 .../src/04-11/app/core/nav/nav.component.css  |   0
 .../src/04-11/app/core/nav/nav.component.html |   0
 .../src/04-11/app/core/nav/nav.component.ts   |   0
 .../app/core/spinner/spinner.component.css    |   0
 .../app/core/spinner/spinner.component.html   |   0
 .../app/core/spinner/spinner.component.ts     |   0
 .../04-11/app/core/spinner/spinner.service.ts |   0
 .../04-11/app/heroes/heroes.component.html    |   0
 .../src/04-11/app/heroes/heroes.component.ts  |   0
 .../src/04-12/app/app.component.ts            |   0
 .../src/04-12/app/app.module.ts               |   0
 .../src/04-12/app/core/core.module.ts         |   0
 .../src/04-12/app/core/index.ts               |   0
 .../src/04-12/app/core/logger.service.ts      |   0
 .../src/04-12/app/core/module-import-guard.ts |   0
 .../src/04-12/app/core/nav/nav.component.css  |   0
 .../src/04-12/app/core/nav/nav.component.html |   0
 .../src/04-12/app/core/nav/nav.component.ts   |   0
 .../04-12/app/heroes/heroes.component.html    |   0
 .../src/04-12/app/heroes/heroes.component.ts  |   0
 .../src/05-02/app/app.component.html          |   0
 .../src/05-02/app/app.component.ts            |   0
 .../src/05-02/app/app.module.ts               |   0
 .../src/05-02/app/heroes/index.ts             |   0
 .../hero-button.component.avoid.ts            |   0
 .../hero-button/hero-button.component.html    |   0
 .../hero-button/hero-button.component.ts      |   0
 .../app/heroes/shared/hero-button/index.ts    |   0
 .../src/05-02/app/heroes/shared/index.ts      |   0
 .../src/05-02/app/index.ts                    |   0
 .../src/05-03/app/app.component.avoid.html    |   0
 .../src/05-03/app/app.component.html          |   0
 .../src/05-03/app/app.component.ts            |   0
 .../src/05-03/app/app.module.ts               |   0
 .../src/05-03/app/heroes/index.ts             |   0
 .../hero-button.component.avoid.ts            |   0
 .../hero-button/hero-button.component.html    |   0
 .../hero-button/hero-button.component.ts      |   0
 .../app/heroes/shared/hero-button/index.ts    |   0
 .../src/05-03/app/heroes/shared/index.ts      |   0
 .../src/05-03/app/index.ts                    |   0
 .../src/05-04/app/app.component.ts            |   0
 .../src/05-04/app/app.module.ts               |   0
 .../app/heroes/heroes.component.avoid.ts      |   0
 .../src/05-04/app/heroes/heroes.component.css |   0
 .../05-04/app/heroes/heroes.component.html    |   0
 .../src/05-04/app/heroes/heroes.component.ts  |   0
 .../src/05-04/app/heroes/index.ts             |   0
 .../src/05-04/app/heroes/shared/hero.model.ts |   0
 .../05-04/app/heroes/shared/hero.service.ts   |   0
 .../src/05-04/app/heroes/shared/index.ts      |   0
 .../src/05-04/app/index.ts                    |   0
 .../src/05-12/app/app.component.ts            |   0
 .../src/05-12/app/app.module.ts               |   0
 .../src/05-12/app/heroes/index.ts             |   0
 .../hero-button.component.avoid.ts            |   0
 .../hero-button/hero-button.component.ts      |   0
 .../app/heroes/shared/hero-button/index.ts    |   0
 .../src/05-12/app/heroes/shared/index.ts      |   0
 .../src/05-12/app/index.ts                    |   0
 .../src/05-13/app/app.component.avoid.html    |   0
 .../src/05-13/app/app.component.html          |   0
 .../src/05-13/app/app.component.ts            |   0
 .../src/05-13/app/app.module.ts               |   0
 .../src/05-13/app/heroes/index.ts             |   0
 .../hero-button.component.avoid.ts            |   0
 .../hero-button/hero-button.component.ts      |   0
 .../app/heroes/shared/hero-button/index.ts    |   0
 .../heroes/shared/hero-highlight.directive.ts |   0
 .../src/05-13/app/heroes/shared/index.ts      |   0
 .../src/05-13/app/index.ts                    |   0
 .../src/05-14/app/app.component.ts            |   0
 .../src/05-14/app/app.module.ts               |   0
 .../src/05-14/app/index.ts                    |   0
 .../src/05-14/app/shared/index.ts             |   0
 .../src/05-14/app/shared/toast/index.ts       |   0
 .../app/shared/toast/toast.component.avoid.ts |   0
 .../05-14/app/shared/toast/toast.component.ts |   0
 .../src/05-15/app/app.component.ts            |   0
 .../src/05-15/app/app.module.ts               |   0
 .../hero-list/hero-list.component.avoid.ts    |   0
 .../heroes/hero-list/hero-list.component.ts   |   0
 .../src/05-15/app/heroes/hero-list/index.ts   |   0
 .../src/05-15/app/heroes/index.ts             |   0
 .../src/05-15/app/heroes/shared/hero.model.ts |   0
 .../05-15/app/heroes/shared/hero.service.ts   |   0
 .../src/05-15/app/heroes/shared/index.ts      |   0
 .../src/05-15/app/index.ts                    |   0
 .../src/05-16/app/app.component.avoid.html    |   0
 .../src/05-16/app/app.component.html          |   0
 .../src/05-16/app/app.component.ts            |   0
 .../src/05-16/app/app.module.ts               |   0
 .../05-16/app/heroes/hero.component.avoid.ts  |   0
 .../src/05-16/app/heroes/hero.component.ts    |   0
 .../src/05-16/app/heroes/index.ts             |   0
 .../src/05-16/app/index.ts                    |   0
 .../src/05-17/app/app.component.ts            |   0
 .../src/05-17/app/app.module.ts               |   0
 .../hero-list/hero-list.component.avoid.ts    |   0
 .../heroes/hero-list/hero-list.component.ts   |   0
 .../src/05-17/app/heroes/hero-list/index.ts   |   0
 .../05-17/app/heroes/hero/hero.component.ts   |   0
 .../src/05-17/app/heroes/hero/index.ts        |   0
 .../src/05-17/app/heroes/index.ts             |   0
 .../src/05-17/app/heroes/shared/hero.model.ts |   0
 .../src/05-17/app/heroes/shared/index.ts      |   0
 .../src/05-17/app/index.ts                    |   0
 .../src/06-01/app/app.component.html          |   0
 .../src/06-01/app/app.component.ts            |   0
 .../src/06-01/app/app.module.ts               |   0
 .../src/06-01/app/index.ts                    |   0
 .../06-01/app/shared/highlight.directive.ts   |   0
 .../src/06-01/app/shared/index.ts             |   0
 .../src/06-03/app/app.component.ts            |   0
 .../src/06-03/app/app.module.ts               |   0
 .../src/06-03/app/index.ts                    |   0
 .../src/06-03/app/shared/index.ts             |   0
 .../06-03/app/shared/validator.directive.ts   |   0
 .../06-03/app/shared/validator2.directive.ts  |   0
 .../src/07-01/app/app.component.html          |   0
 .../src/07-01/app/app.component.ts            |   0
 .../src/07-01/app/app.module.ts               |   0
 .../src/07-01/app/heroes/index.ts             |   0
 .../src/07-01/app/heroes/shared/hero.model.ts |   0
 .../07-01/app/heroes/shared/hero.service.ts   |   0
 .../src/07-01/app/heroes/shared/index.ts      |   0
 .../src/07-01/app/index.ts                    |   0
 .../src/07-03/app/app.component.ts            |   0
 .../src/07-03/app/app.module.ts               |   0
 .../heroes/hero-list/hero-list.component.ts   |   0
 .../src/07-03/app/heroes/hero-list/index.ts   |   0
 .../src/07-03/app/heroes/index.ts             |   0
 .../src/07-03/app/heroes/shared/hero.model.ts |   0
 .../07-03/app/heroes/shared/hero.service.ts   |   0
 .../src/07-03/app/heroes/shared/index.ts      |   0
 .../src/07-03/app/index.ts                    |   0
 .../src/07-04/app/app.component.ts            |   0
 .../src/07-04/app/app.module.ts               |   0
 .../src/07-04/app/heroes/index.ts             |   0
 .../heroes/shared/hero-arena.service.avoid.ts |   0
 .../app/heroes/shared/hero-arena.service.ts   |   0
 .../src/07-04/app/heroes/shared/hero.model.ts |   0
 .../07-04/app/heroes/shared/hero.service.ts   |   0
 .../src/07-04/app/heroes/shared/index.ts      |   0
 .../src/07-04/app/index.ts                    |   0
 .../src/09-01/app/app.component.ts            |   0
 .../src/09-01/app/app.module.ts               |   0
 .../src/09-01/app/heroes/index.ts             |   0
 .../hero-button.component.avoid.ts            |   0
 .../hero-button/hero-button.component.ts      |   0
 .../app/heroes/shared/hero-button/index.ts    |   0
 .../src/09-01/app/heroes/shared/index.ts      |   0
 .../src/09-01/app/index.ts                    |   0
 .../src/app/app.component.html                |   0
 .../src/app/app.component.ts                  |   0
 .../src/app/app.routes.ts                     |   0
 .../src/app/hero-data.ts                      |   0
 .../src/index.html                            |   0
 .../{style-guide => styleguide}/src/main.ts   |   0
 .../src/systemjs.custom.js                    |   0
 .../examples/testing/src/app/bag/bag.ts       |   2 +-
 aio/content/examples/toh-pt6/e2e-spec.ts      |   8 +-
 .../{cb-ts-to-js => ts-to-js}/e2e-spec.ts     |   0
 .../js-es6-decorators/example-config.json     |   0
 .../js-es6-decorators/plnkr.json              |   0
 .../js-es6-decorators/src/.babelrc            |   0
 .../src/app/app.component.es6                 |   0
 .../src/app/app.component.html                |   0
 .../js-es6-decorators/src/app/app.module.es6  |   0
 .../src/app/confirm.component.es6             |   0
 .../src/app/confirm.component.html            |   0
 .../src/app/data.service.es6                  |   0
 .../hero-di-inject-additional.component.es6   |   0
 .../src/app/hero-di-inject.component.es6      |   0
 .../src/app/hero-di.component.es6             |   0
 .../src/app/hero-host-meta.component.es6      |   0
 .../src/app/hero-host.component.es6           |   0
 .../src/app/hero-io.component.es6             |   0
 .../src/app/hero-lifecycle.component.es6      |   0
 .../src/app/hero-queries.component.es6        |   0
 .../src/app/hero-title.component.es6          |   0
 .../src/app/hero-title.component.html         |   0
 .../src/app/hero.component.es6                |   0
 .../js-es6-decorators/src/index.html          |   0
 .../js-es6-decorators/src/main.es6            |   0
 .../js-es6/example-config.json                |   0
 .../js-es6/plnkr.json                         |   0
 .../js-es6/src/.babelrc                       |   0
 .../js-es6/src/app/app.component.es6          |   0
 .../js-es6/src/app/app.component.html         |   0
 .../js-es6/src/app/app.module.es6             |   0
 .../js-es6/src/app/confirm.component.es6      |   0
 .../js-es6/src/app/confirm.component.html     |   0
 .../js-es6/src/app/data.service.es6           |   0
 .../hero-di-inject-additional.component.es6   |   0
 .../src/app/hero-di-inject.component.es6      |   0
 .../js-es6/src/app/hero-di.component.es6      |   0
 .../js-es6/src/app/hero-host.component.es6    |   0
 .../js-es6/src/app/hero-io.component.es6      |   0
 .../src/app/hero-lifecycle.component.es6      |   0
 .../js-es6/src/app/hero-queries.component.es6 |   0
 .../js-es6/src/app/hero-title.component.es6   |   0
 .../js-es6/src/app/hero-title.component.html  |   0
 .../js-es6/src/app/hero.component.es6         |   0
 .../js-es6/src/index.html                     |   0
 .../js-es6/src/main.es6                       |   0
 .../js/example-config.json                    |   0
 .../{cb-ts-to-js => ts-to-js}/js/plnkr.json   |   0
 .../js/src/app/app.component.html             |   0
 .../js/src/app/app.component.js               |   0
 .../js/src/app/app.module.js                  |   0
 .../js/src/app/confirm.component.html         |   0
 .../js/src/app/confirm.component.js           |   0
 .../js/src/app/data.service.js                |   0
 .../hero-di-inject-additional.component.js    |   0
 .../js/src/app/hero-di-inject.component.js    |   0
 .../js/src/app/hero-di.component.js           |   0
 .../js/src/app/hero-host.component.js         |   0
 .../js/src/app/hero-io-dsl.component.html     |   0
 .../js/src/app/hero-io.component.html         |   0
 .../js/src/app/hero-io.component.js           |   0
 .../js/src/app/hero-lifecycle.component.js    |   0
 .../js/src/app/hero-queries.component.js      |   0
 .../js/src/app/hero-title.component.html      |   0
 .../js/src/app/hero-title.component.js        |   0
 .../js/src/app/hero.component.js              |   0
 .../js/src/index.html                         |   0
 .../{cb-ts-to-js => ts-to-js}/js/src/main.js  |   0
 .../ts}/example-config.json                   |   0
 .../{cb-ts-to-js => ts-to-js}/ts/plnkr.json   |   0
 .../ts/src/app/app.component.html             |   0
 .../ts/src/app/app.component.ts               |   0
 .../ts/src/app/app.module.ts                  |   0
 .../ts/src/app/confirm.component.html         |   0
 .../ts/src/app/confirm.component.ts           |   0
 .../ts/src/app/data.service.ts                |   0
 .../hero-di-inject-additional.component.ts    |   0
 .../ts/src/app/hero-di-inject.component.ts    |   0
 .../ts/src/app/hero-di.component.ts           |   0
 .../ts/src/app/hero-host-meta.component.ts    |   0
 .../ts/src/app/hero-host.component.ts         |   0
 .../ts/src/app/hero-io.component.ts           |   0
 .../ts/src/app/hero-lifecycle.component.ts    |   0
 .../ts/src/app/hero-queries.component.ts      |   0
 .../ts/src/app/hero-title.component.html      |   0
 .../ts/src/app/hero-title.component.ts        |   0
 .../ts/src/app/hero.component.ts              |   0
 .../ts/src/index.html                         |   0
 .../{cb-ts-to-js => ts-to-js}/ts/src/main.ts  |   0
 .../.gitignore                                |   0
 .../tsconfig.json                             |   0
 aio/content/guide/ajs-quick-reference.md      |  60 ++---
 aio/content/guide/aot-compiler.md             |  34 +--
 aio/content/guide/architecture.md             |   2 +-
 aio/content/guide/browser-support.md          |   2 +-
 aio/content/guide/cb-index.md                 |  43 ----
 aio/content/guide/change-log.md               |   6 +-
 aio/content/guide/cli-quickstart.md           |   2 +-
 aio/content/guide/component-communication.md  |  42 ++--
 ...n.md => dependency-injection-in-action.md} | 212 +++++++++---------
 aio/content/{marketing => guide}/docs.md      |   0
 aio/content/guide/dynamic-component-loader.md |  18 +-
 aio/content/guide/dynamic-form.md             |  26 +--
 aio/content/guide/form-validation.md          |  56 ++---
 .../guide/{core.md => fundamentals.md}        |   0
 aio/content/guide/http.md                     |   2 +-
 aio/content/guide/i18n.md                     |  56 ++---
 aio/content/guide/lifecycle-hooks.md          |   2 +-
 aio/content/guide/npm-packages.md             |   2 +-
 aio/content/guide/pipes.md                    |   2 +-
 aio/content/guide/router.md                   |   4 +-
 aio/content/guide/set-document-title.md       |  10 +-
 aio/content/guide/setup-systemjs-anatomy.md   |   2 +-
 aio/content/guide/structural-directives.md    |   2 +-
 .../guide/{style-guide.md => styleguide.md}   | 180 +++++++--------
 .../guide/{additional.md => techniques.md}    |   0
 aio/content/guide/ts-to-js.md                 | 140 ++++++------
 aio/content/guide/upgrade.md                  |   4 +-
 aio/content/tutorial/index.md                 |   2 +-
 aio/content/tutorial/toh-pt3.md               |   4 +-
 aio/content/tutorial/toh-pt6.md               |   4 +-
 aio/firebase.json                             |  11 +-
 .../live-example.component.spec.ts            |   6 +-
 .../live-example/live-example.component.ts    |  14 +-
 .../{toh6-bundle.png => toh-pt6-bundle.png}   | Bin
 aio/src/testing/nav-map-json-response.ts      |   2 +-
 aio/tools/examples/run-example-e2e.js         |   2 +-
 543 files changed, 467 insertions(+), 510 deletions(-)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/e2e-spec.ts (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/example-config.json (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/plnkr.json (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/src/app/app-routing.module.ts (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/src/app/app.component.css (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/src/app/app.component.html (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/src/app/app.component.ts (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/src/app/app.module.1.ts (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/src/app/app.module.ts (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/src/app/date.pipe.ts (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/src/app/movie-list.component.css (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/src/app/movie-list.component.html (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/src/app/movie-list.component.ts (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/src/app/movie.service.ts (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/src/app/movie.ts (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/src/images/hero.png (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/src/images/ng-logo.png (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/src/images/villain.png (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/src/index.html (100%)
 rename aio/content/examples/{cb-ajs-quick-reference => ajs-quick-reference}/src/main.ts (100%)
 rename aio/content/examples/{cb-aot-compiler => aot-compiler}/.gitignore (100%)
 rename aio/content/examples/{cb-aot-compiler => aot-compiler}/e2e-spec.ts (100%)
 rename aio/content/examples/{cb-aot-compiler => aot-compiler}/example-config.json (100%)
 rename aio/content/examples/{cb-aot-compiler => aot-compiler}/rollup-config.js (100%)
 rename aio/content/examples/{cb-aot-compiler => aot-compiler}/src/app/app.component.html (100%)
 rename aio/content/examples/{cb-aot-compiler => aot-compiler}/src/app/app.component.ts (100%)
 rename aio/content/examples/{cb-aot-compiler => aot-compiler}/src/app/app.module.ts (100%)
 rename aio/content/examples/{cb-aot-compiler => aot-compiler}/src/index-jit.html (100%)
 rename aio/content/examples/{cb-aot-compiler => aot-compiler}/src/index.html (100%)
 rename aio/content/examples/{cb-aot-compiler => aot-compiler}/src/main-jit.ts (100%)
 rename aio/content/examples/{cb-aot-compiler => aot-compiler}/src/main.ts (100%)
 rename aio/content/examples/{cb-aot-compiler => aot-compiler}/tsconfig-aot.json (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/.gitignore (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/e2e-spec.ts (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/example-config.json (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/plnkr.json (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/app/app.component.html (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/app/app.component.ts (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/app/app.module.ts (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/app/astronaut.component.ts (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/app/countdown-parent.component.ts (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/app/countdown-timer.component.ts (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/app/hero-child.component.ts (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/app/hero-parent.component.ts (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/app/hero.ts (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/app/mission.service.ts (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/app/missioncontrol.component.ts (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/app/name-child.component.ts (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/app/name-parent.component.ts (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/app/version-child.component.ts (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/app/version-parent.component.ts (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/app/voter.component.ts (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/app/votetaker.component.ts (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/demo.css (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/index.html (100%)
 rename aio/content/examples/{cb-component-communication => component-communication}/src/main.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/e2e-spec.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/example-config.json (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/plnkr.json (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/app-routing.module.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/app.component.html (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/app.component.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/app.module.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/date-logger.service.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/hero-bio.component.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/hero-bios.component.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/hero-cache.service.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/hero-contact.component.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/hero-data.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/hero-of-the-month.component.1.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/hero-of-the-month.component.html (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/hero-of-the-month.component.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/hero.service.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/hero.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/highlight.directive.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/logger.service.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/minimal-logger.service.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/parent-finder.component.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/runners-up.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/sorted-heroes.component.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/user-context.service.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/app/user.service.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/index.html (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/main.ts (100%)
 rename aio/content/examples/{cb-dependency-injection => dependency-injection-in-action}/src/sample.css (100%)
 rename aio/content/examples/{cb-dynamic-component-loader => dynamic-component-loader}/e2e-spec.ts (100%)
 rename aio/content/examples/{cb-dynamic-component-loader => dynamic-component-loader}/example-config.json (100%)
 rename aio/content/examples/{cb-dynamic-component-loader => dynamic-component-loader}/plnkr.json (100%)
 rename aio/content/examples/{cb-dynamic-component-loader => dynamic-component-loader}/src/app/ad-banner.component.ts (100%)
 rename aio/content/examples/{cb-dynamic-component-loader => dynamic-component-loader}/src/app/ad-item.ts (100%)
 rename aio/content/examples/{cb-dynamic-component-loader => dynamic-component-loader}/src/app/ad.component.ts (100%)
 rename aio/content/examples/{cb-dynamic-component-loader => dynamic-component-loader}/src/app/ad.directive.ts (100%)
 rename aio/content/examples/{cb-dynamic-component-loader => dynamic-component-loader}/src/app/ad.service.ts (100%)
 rename aio/content/examples/{cb-dynamic-component-loader => dynamic-component-loader}/src/app/app.component.ts (100%)
 rename aio/content/examples/{cb-dynamic-component-loader => dynamic-component-loader}/src/app/app.module.ts (100%)
 rename aio/content/examples/{cb-dynamic-component-loader => dynamic-component-loader}/src/app/hero-job-ad.component.ts (100%)
 rename aio/content/examples/{cb-dynamic-component-loader => dynamic-component-loader}/src/app/hero-profile.component.ts (100%)
 rename aio/content/examples/{cb-dynamic-component-loader => dynamic-component-loader}/src/index.html (100%)
 rename aio/content/examples/{cb-dynamic-component-loader => dynamic-component-loader}/src/main.ts (100%)
 rename aio/content/examples/{cb-dynamic-component-loader => dynamic-component-loader}/src/sample.css (100%)
 rename aio/content/examples/{cb-dynamic-form => dynamic-form}/e2e-spec.ts (100%)
 rename aio/content/examples/{cb-dynamic-form => dynamic-form}/example-config.json (100%)
 rename aio/content/examples/{cb-dynamic-form => dynamic-form}/plnkr.json (100%)
 rename aio/content/examples/{cb-dynamic-form => dynamic-form}/src/app/app.component.ts (100%)
 rename aio/content/examples/{cb-dynamic-form => dynamic-form}/src/app/app.module.ts (100%)
 rename aio/content/examples/{cb-dynamic-form => dynamic-form}/src/app/dynamic-form-question.component.html (100%)
 rename aio/content/examples/{cb-dynamic-form => dynamic-form}/src/app/dynamic-form-question.component.ts (100%)
 rename aio/content/examples/{cb-dynamic-form => dynamic-form}/src/app/dynamic-form.component.html (100%)
 rename aio/content/examples/{cb-dynamic-form => dynamic-form}/src/app/dynamic-form.component.ts (100%)
 rename aio/content/examples/{cb-dynamic-form => dynamic-form}/src/app/question-base.ts (100%)
 rename aio/content/examples/{cb-dynamic-form => dynamic-form}/src/app/question-control.service.ts (100%)
 rename aio/content/examples/{cb-dynamic-form => dynamic-form}/src/app/question-dropdown.ts (100%)
 rename aio/content/examples/{cb-dynamic-form => dynamic-form}/src/app/question-textbox.ts (100%)
 rename aio/content/examples/{cb-dynamic-form => dynamic-form}/src/app/question.service.ts (100%)
 rename aio/content/examples/{cb-dynamic-form => dynamic-form}/src/index.html (100%)
 rename aio/content/examples/{cb-dynamic-form => dynamic-form}/src/main.ts (100%)
 rename aio/content/examples/{cb-dynamic-form => dynamic-form}/src/sample.css (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/e2e-spec.ts (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/example-config.json (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/plnkr.json (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/src/app/app.component.ts (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/src/app/app.module.ts (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/src/app/reactive/hero-form-reactive.component.html (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/src/app/reactive/hero-form-reactive.component.ts (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/src/app/reactive/hero-form-reactive.module.ts (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/src/app/shared/forbidden-name.directive.ts (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/src/app/shared/hero.ts (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/src/app/shared/shared.module.ts (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/src/app/shared/submitted.component.ts (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/src/app/template/hero-form-template.module.ts (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/src/app/template/hero-form-template1.component.html (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/src/app/template/hero-form-template1.component.ts (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/src/app/template/hero-form-template2.component.html (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/src/app/template/hero-form-template2.component.ts (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/src/forms.css (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/src/index.html (100%)
 rename aio/content/examples/{cb-form-validation => form-validation}/src/main.ts (100%)
 rename aio/content/examples/{cb-i18n => i18n}/.gitignore (100%)
 rename aio/content/examples/{cb-i18n => i18n}/e2e-spec.ts (100%)
 rename aio/content/examples/{cb-i18n => i18n}/example-config.json (100%)
 rename aio/content/examples/{cb-i18n => i18n}/messages.xlf (100%)
 rename aio/content/examples/{cb-i18n => i18n}/plnkr.json (100%)
 rename aio/content/examples/{cb-i18n => i18n}/src/app/app.component.1.html (100%)
 rename aio/content/examples/{cb-i18n => i18n}/src/app/app.component.html (100%)
 rename aio/content/examples/{cb-i18n => i18n}/src/app/app.component.ts (100%)
 rename aio/content/examples/{cb-i18n => i18n}/src/app/app.module.ts (100%)
 rename aio/content/examples/{cb-i18n => i18n}/src/app/i18n-providers.ts (100%)
 rename aio/content/examples/{cb-i18n => i18n}/src/index.html (100%)
 rename aio/content/examples/{cb-i18n => i18n}/src/locale/messages.es.xlf (100%)
 rename aio/content/examples/{cb-i18n => i18n}/src/locale/messages.es.xlf.html (100%)
 rename aio/content/examples/{cb-i18n => i18n}/src/main.1.ts (100%)
 rename aio/content/examples/{cb-i18n => i18n}/src/main.ts (100%)
 rename aio/content/examples/{cb-i18n => i18n}/src/systemjs-text-plugin.js (100%)
 rename aio/content/examples/{cb-set-document-title => set-document-title}/e2e-spec.ts (84%)
 rename aio/content/examples/{cb-set-document-title => set-document-title}/example-config.json (100%)
 rename aio/content/examples/{cb-set-document-title => set-document-title}/plnkr.json (100%)
 rename aio/content/examples/{cb-set-document-title => set-document-title}/src/app/app.component.ts (100%)
 rename aio/content/examples/{cb-set-document-title => set-document-title}/src/app/app.module.ts (100%)
 rename aio/content/examples/{cb-set-document-title => set-document-title}/src/index.html (100%)
 rename aio/content/examples/{cb-set-document-title => set-document-title}/src/main.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/.gitignore (100%)
 rename aio/content/examples/{style-guide => styleguide}/e2e-spec.ts (100%)
 rename aio/content/examples/{cb-ts-to-js/ts => styleguide}/example-config.json (100%)
 rename aio/content/examples/{style-guide => styleguide}/plnkr.json (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/01-01/app/app.component.css (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/01-01/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/01-01/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/01-01/app/heroes/hero.component.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/01-01/app/heroes/heroes.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/01-01/app/heroes/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/01-01/app/heroes/shared/hero.model.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/01-01/app/heroes/shared/hero.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/01-01/app/heroes/shared/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/01-01/app/heroes/shared/mock-heroes.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/01-01/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/01-01/main.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-05/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-05/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-05/main.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-07/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-07/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-07/app/heroes/hero.component.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-07/app/heroes/hero.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-07/app/heroes/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-07/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-07/app/users/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-07/app/users/users.component.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-07/app/users/users.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-08/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-08/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-08/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-08/app/shared/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-08/app/shared/input-highlight.directive.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-08/app/shared/validate.directive.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/02-08/app/shared/validate.directive.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-01/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-01/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-01/app/core/exception.service.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-01/app/core/exception.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-01/app/core/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-01/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-02/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-02/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-02/app/core/data.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-02/app/core/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-02/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-03/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-03/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-03/app/core/hero-collector.service.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-03/app/core/hero-collector.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-03/app/core/hero.model.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-03/app/core/hero.model.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-03/app/core/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-03/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-04/app/app.component.ts (90%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-04/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-04/app/core/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-04/app/core/toast.service.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-04/app/core/toast.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-04/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/app.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/core/exception.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/core/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/core/spinner/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/core/spinner/spinner.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/core/spinner/spinner.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/core/toast/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/core/toast/toast.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/core/toast/toast.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/heroes/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/heroes/shared/hero.model.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/heroes/shared/hero.service.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/heroes/shared/hero.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/heroes/shared/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/03-06/app/shared/toast/toast.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-08/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-08/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-08/app/heroes/heroes.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-08/app/heroes/heroes.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-10/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-10/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-10/app/heroes/heroes.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-10/app/heroes/heroes.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-10/app/shared/filter-text/filter-text.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-10/app/shared/filter-text/filter-text.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-10/app/shared/init-caps.pipe.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-10/app/shared/shared.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-11/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-11/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-11/app/core/core.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-11/app/core/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-11/app/core/logger.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-11/app/core/nav/nav.component.css (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-11/app/core/nav/nav.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-11/app/core/nav/nav.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-11/app/core/spinner/spinner.component.css (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-11/app/core/spinner/spinner.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-11/app/core/spinner/spinner.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-11/app/core/spinner/spinner.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-11/app/heroes/heroes.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-11/app/heroes/heroes.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-12/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-12/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-12/app/core/core.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-12/app/core/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-12/app/core/logger.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-12/app/core/module-import-guard.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-12/app/core/nav/nav.component.css (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-12/app/core/nav/nav.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-12/app/core/nav/nav.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-12/app/heroes/heroes.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/04-12/app/heroes/heroes.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-02/app/app.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-02/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-02/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-02/app/heroes/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-02/app/heroes/shared/hero-button/hero-button.component.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-02/app/heroes/shared/hero-button/hero-button.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-02/app/heroes/shared/hero-button/hero-button.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-02/app/heroes/shared/hero-button/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-02/app/heroes/shared/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-02/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-03/app/app.component.avoid.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-03/app/app.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-03/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-03/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-03/app/heroes/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-03/app/heroes/shared/hero-button/hero-button.component.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-03/app/heroes/shared/hero-button/hero-button.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-03/app/heroes/shared/hero-button/hero-button.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-03/app/heroes/shared/hero-button/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-03/app/heroes/shared/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-03/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-04/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-04/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-04/app/heroes/heroes.component.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-04/app/heroes/heroes.component.css (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-04/app/heroes/heroes.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-04/app/heroes/heroes.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-04/app/heroes/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-04/app/heroes/shared/hero.model.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-04/app/heroes/shared/hero.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-04/app/heroes/shared/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-04/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-12/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-12/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-12/app/heroes/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-12/app/heroes/shared/hero-button/hero-button.component.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-12/app/heroes/shared/hero-button/hero-button.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-12/app/heroes/shared/hero-button/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-12/app/heroes/shared/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-12/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-13/app/app.component.avoid.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-13/app/app.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-13/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-13/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-13/app/heroes/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-13/app/heroes/shared/hero-button/hero-button.component.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-13/app/heroes/shared/hero-button/hero-button.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-13/app/heroes/shared/hero-button/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-13/app/heroes/shared/hero-highlight.directive.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-13/app/heroes/shared/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-13/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-14/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-14/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-14/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-14/app/shared/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-14/app/shared/toast/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-14/app/shared/toast/toast.component.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-14/app/shared/toast/toast.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-15/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-15/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-15/app/heroes/hero-list/hero-list.component.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-15/app/heroes/hero-list/hero-list.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-15/app/heroes/hero-list/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-15/app/heroes/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-15/app/heroes/shared/hero.model.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-15/app/heroes/shared/hero.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-15/app/heroes/shared/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-15/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-16/app/app.component.avoid.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-16/app/app.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-16/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-16/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-16/app/heroes/hero.component.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-16/app/heroes/hero.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-16/app/heroes/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-16/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-17/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-17/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-17/app/heroes/hero-list/hero-list.component.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-17/app/heroes/hero-list/hero-list.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-17/app/heroes/hero-list/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-17/app/heroes/hero/hero.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-17/app/heroes/hero/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-17/app/heroes/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-17/app/heroes/shared/hero.model.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-17/app/heroes/shared/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/05-17/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/06-01/app/app.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/06-01/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/06-01/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/06-01/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/06-01/app/shared/highlight.directive.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/06-01/app/shared/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/06-03/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/06-03/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/06-03/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/06-03/app/shared/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/06-03/app/shared/validator.directive.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/06-03/app/shared/validator2.directive.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-01/app/app.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-01/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-01/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-01/app/heroes/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-01/app/heroes/shared/hero.model.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-01/app/heroes/shared/hero.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-01/app/heroes/shared/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-01/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-03/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-03/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-03/app/heroes/hero-list/hero-list.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-03/app/heroes/hero-list/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-03/app/heroes/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-03/app/heroes/shared/hero.model.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-03/app/heroes/shared/hero.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-03/app/heroes/shared/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-03/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-04/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-04/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-04/app/heroes/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-04/app/heroes/shared/hero-arena.service.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-04/app/heroes/shared/hero-arena.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-04/app/heroes/shared/hero.model.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-04/app/heroes/shared/hero.service.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-04/app/heroes/shared/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/07-04/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/09-01/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/09-01/app/app.module.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/09-01/app/heroes/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/09-01/app/heroes/shared/hero-button/hero-button.component.avoid.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/09-01/app/heroes/shared/hero-button/hero-button.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/09-01/app/heroes/shared/hero-button/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/09-01/app/heroes/shared/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/09-01/app/index.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/app/app.component.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/app/app.component.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/app/app.routes.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/app/hero-data.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/index.html (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/main.ts (100%)
 rename aio/content/examples/{style-guide => styleguide}/src/systemjs.custom.js (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/e2e-spec.ts (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/example-config.json (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/plnkr.json (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/.babelrc (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/app/app.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/app/app.component.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/app/app.module.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/app/confirm.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/app/confirm.component.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/app/data.service.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/app/hero-di-inject-additional.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/app/hero-di-inject.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/app/hero-di.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/app/hero-host-meta.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/app/hero-host.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/app/hero-io.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/app/hero-lifecycle.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/app/hero-queries.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/app/hero-title.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/app/hero-title.component.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/app/hero.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/index.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6-decorators/src/main.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/example-config.json (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/plnkr.json (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/.babelrc (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/app/app.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/app/app.component.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/app/app.module.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/app/confirm.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/app/confirm.component.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/app/data.service.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/app/hero-di-inject-additional.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/app/hero-di-inject.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/app/hero-di.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/app/hero-host.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/app/hero-io.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/app/hero-lifecycle.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/app/hero-queries.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/app/hero-title.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/app/hero-title.component.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/app/hero.component.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/index.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js-es6/src/main.es6 (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/example-config.json (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/plnkr.json (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/app.component.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/app.component.js (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/app.module.js (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/confirm.component.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/confirm.component.js (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/data.service.js (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/hero-di-inject-additional.component.js (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/hero-di-inject.component.js (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/hero-di.component.js (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/hero-host.component.js (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/hero-io-dsl.component.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/hero-io.component.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/hero-io.component.js (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/hero-lifecycle.component.js (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/hero-queries.component.js (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/hero-title.component.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/hero-title.component.js (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/app/hero.component.js (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/index.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/js/src/main.js (100%)
 rename aio/content/examples/{style-guide => ts-to-js/ts}/example-config.json (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/plnkr.json (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/app/app.component.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/app/app.component.ts (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/app/app.module.ts (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/app/confirm.component.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/app/confirm.component.ts (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/app/data.service.ts (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/app/hero-di-inject-additional.component.ts (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/app/hero-di-inject.component.ts (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/app/hero-di.component.ts (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/app/hero-host-meta.component.ts (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/app/hero-host.component.ts (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/app/hero-io.component.ts (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/app/hero-lifecycle.component.ts (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/app/hero-queries.component.ts (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/app/hero-title.component.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/app/hero-title.component.ts (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/app/hero.component.ts (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/index.html (100%)
 rename aio/content/examples/{cb-ts-to-js => ts-to-js}/ts/src/main.ts (100%)
 rename aio/content/examples/{cb-visual-studio-2015 => visual-studio-2015}/.gitignore (100%)
 rename aio/content/examples/{cb-visual-studio-2015 => visual-studio-2015}/tsconfig.json (100%)
 delete mode 100644 aio/content/guide/cb-index.md
 rename aio/content/guide/{cb-dependency-injection.md => dependency-injection-in-action.md} (71%)
 rename aio/content/{marketing => guide}/docs.md (100%)
 rename aio/content/guide/{core.md => fundamentals.md} (100%)
 rename aio/content/guide/{style-guide.md => styleguide.md} (86%)
 rename aio/content/guide/{additional.md => techniques.md} (100%)
 rename aio/src/assets/images/cookbooks/aot-compiler/{toh6-bundle.png => toh-pt6-bundle.png} (100%)

diff --git a/aio/content/examples/.gitignore b/aio/content/examples/.gitignore
index 10cbf20570..cef6633ab1 100644
--- a/aio/content/examples/.gitignore
+++ b/aio/content/examples/.gitignore
@@ -56,15 +56,15 @@ dist/
 !testing/karma*.js
 
 # TS to JS
-!cb-ts-to-js/js*/**/*.js
-cb-ts-to-js/js*/**/system*.js
+!ts-to-js/js*/**/*.js
+ts-to-js/js*/**/system*.js
 
 # webpack
 !webpack/**/config/*.js
 !webpack/**/*webpack*.js
 
-# style-guide
-!style-guide/src/systemjs.custom.js
+# styleguide
+!styleguide/src/systemjs.custom.js
 
 # plunkers
 *plnkr.no-link.html
diff --git a/aio/content/examples/cb-ajs-quick-reference/e2e-spec.ts b/aio/content/examples/ajs-quick-reference/e2e-spec.ts
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/e2e-spec.ts
rename to aio/content/examples/ajs-quick-reference/e2e-spec.ts
diff --git a/aio/content/examples/cb-ajs-quick-reference/example-config.json b/aio/content/examples/ajs-quick-reference/example-config.json
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/example-config.json
rename to aio/content/examples/ajs-quick-reference/example-config.json
diff --git a/aio/content/examples/cb-ajs-quick-reference/plnkr.json b/aio/content/examples/ajs-quick-reference/plnkr.json
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/plnkr.json
rename to aio/content/examples/ajs-quick-reference/plnkr.json
diff --git a/aio/content/examples/cb-ajs-quick-reference/src/app/app-routing.module.ts b/aio/content/examples/ajs-quick-reference/src/app/app-routing.module.ts
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/src/app/app-routing.module.ts
rename to aio/content/examples/ajs-quick-reference/src/app/app-routing.module.ts
diff --git a/aio/content/examples/cb-ajs-quick-reference/src/app/app.component.css b/aio/content/examples/ajs-quick-reference/src/app/app.component.css
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/src/app/app.component.css
rename to aio/content/examples/ajs-quick-reference/src/app/app.component.css
diff --git a/aio/content/examples/cb-ajs-quick-reference/src/app/app.component.html b/aio/content/examples/ajs-quick-reference/src/app/app.component.html
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/src/app/app.component.html
rename to aio/content/examples/ajs-quick-reference/src/app/app.component.html
diff --git a/aio/content/examples/cb-ajs-quick-reference/src/app/app.component.ts b/aio/content/examples/ajs-quick-reference/src/app/app.component.ts
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/src/app/app.component.ts
rename to aio/content/examples/ajs-quick-reference/src/app/app.component.ts
diff --git a/aio/content/examples/cb-ajs-quick-reference/src/app/app.module.1.ts b/aio/content/examples/ajs-quick-reference/src/app/app.module.1.ts
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/src/app/app.module.1.ts
rename to aio/content/examples/ajs-quick-reference/src/app/app.module.1.ts
diff --git a/aio/content/examples/cb-ajs-quick-reference/src/app/app.module.ts b/aio/content/examples/ajs-quick-reference/src/app/app.module.ts
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/src/app/app.module.ts
rename to aio/content/examples/ajs-quick-reference/src/app/app.module.ts
diff --git a/aio/content/examples/cb-ajs-quick-reference/src/app/date.pipe.ts b/aio/content/examples/ajs-quick-reference/src/app/date.pipe.ts
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/src/app/date.pipe.ts
rename to aio/content/examples/ajs-quick-reference/src/app/date.pipe.ts
diff --git a/aio/content/examples/cb-ajs-quick-reference/src/app/movie-list.component.css b/aio/content/examples/ajs-quick-reference/src/app/movie-list.component.css
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/src/app/movie-list.component.css
rename to aio/content/examples/ajs-quick-reference/src/app/movie-list.component.css
diff --git a/aio/content/examples/cb-ajs-quick-reference/src/app/movie-list.component.html b/aio/content/examples/ajs-quick-reference/src/app/movie-list.component.html
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/src/app/movie-list.component.html
rename to aio/content/examples/ajs-quick-reference/src/app/movie-list.component.html
diff --git a/aio/content/examples/cb-ajs-quick-reference/src/app/movie-list.component.ts b/aio/content/examples/ajs-quick-reference/src/app/movie-list.component.ts
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/src/app/movie-list.component.ts
rename to aio/content/examples/ajs-quick-reference/src/app/movie-list.component.ts
diff --git a/aio/content/examples/cb-ajs-quick-reference/src/app/movie.service.ts b/aio/content/examples/ajs-quick-reference/src/app/movie.service.ts
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/src/app/movie.service.ts
rename to aio/content/examples/ajs-quick-reference/src/app/movie.service.ts
diff --git a/aio/content/examples/cb-ajs-quick-reference/src/app/movie.ts b/aio/content/examples/ajs-quick-reference/src/app/movie.ts
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/src/app/movie.ts
rename to aio/content/examples/ajs-quick-reference/src/app/movie.ts
diff --git a/aio/content/examples/cb-ajs-quick-reference/src/images/hero.png b/aio/content/examples/ajs-quick-reference/src/images/hero.png
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/src/images/hero.png
rename to aio/content/examples/ajs-quick-reference/src/images/hero.png
diff --git a/aio/content/examples/cb-ajs-quick-reference/src/images/ng-logo.png b/aio/content/examples/ajs-quick-reference/src/images/ng-logo.png
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/src/images/ng-logo.png
rename to aio/content/examples/ajs-quick-reference/src/images/ng-logo.png
diff --git a/aio/content/examples/cb-ajs-quick-reference/src/images/villain.png b/aio/content/examples/ajs-quick-reference/src/images/villain.png
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/src/images/villain.png
rename to aio/content/examples/ajs-quick-reference/src/images/villain.png
diff --git a/aio/content/examples/cb-ajs-quick-reference/src/index.html b/aio/content/examples/ajs-quick-reference/src/index.html
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/src/index.html
rename to aio/content/examples/ajs-quick-reference/src/index.html
diff --git a/aio/content/examples/cb-ajs-quick-reference/src/main.ts b/aio/content/examples/ajs-quick-reference/src/main.ts
similarity index 100%
rename from aio/content/examples/cb-ajs-quick-reference/src/main.ts
rename to aio/content/examples/ajs-quick-reference/src/main.ts
diff --git a/aio/content/examples/cb-aot-compiler/.gitignore b/aio/content/examples/aot-compiler/.gitignore
similarity index 100%
rename from aio/content/examples/cb-aot-compiler/.gitignore
rename to aio/content/examples/aot-compiler/.gitignore
diff --git a/aio/content/examples/cb-aot-compiler/e2e-spec.ts b/aio/content/examples/aot-compiler/e2e-spec.ts
similarity index 100%
rename from aio/content/examples/cb-aot-compiler/e2e-spec.ts
rename to aio/content/examples/aot-compiler/e2e-spec.ts
diff --git a/aio/content/examples/cb-aot-compiler/example-config.json b/aio/content/examples/aot-compiler/example-config.json
similarity index 100%
rename from aio/content/examples/cb-aot-compiler/example-config.json
rename to aio/content/examples/aot-compiler/example-config.json
diff --git a/aio/content/examples/cb-aot-compiler/rollup-config.js b/aio/content/examples/aot-compiler/rollup-config.js
similarity index 100%
rename from aio/content/examples/cb-aot-compiler/rollup-config.js
rename to aio/content/examples/aot-compiler/rollup-config.js
diff --git a/aio/content/examples/cb-aot-compiler/src/app/app.component.html b/aio/content/examples/aot-compiler/src/app/app.component.html
similarity index 100%
rename from aio/content/examples/cb-aot-compiler/src/app/app.component.html
rename to aio/content/examples/aot-compiler/src/app/app.component.html
diff --git a/aio/content/examples/cb-aot-compiler/src/app/app.component.ts b/aio/content/examples/aot-compiler/src/app/app.component.ts
similarity index 100%
rename from aio/content/examples/cb-aot-compiler/src/app/app.component.ts
rename to aio/content/examples/aot-compiler/src/app/app.component.ts
diff --git a/aio/content/examples/cb-aot-compiler/src/app/app.module.ts b/aio/content/examples/aot-compiler/src/app/app.module.ts
similarity index 100%
rename from aio/content/examples/cb-aot-compiler/src/app/app.module.ts
rename to aio/content/examples/aot-compiler/src/app/app.module.ts
diff --git a/aio/content/examples/cb-aot-compiler/src/index-jit.html b/aio/content/examples/aot-compiler/src/index-jit.html
similarity index 100%
rename from aio/content/examples/cb-aot-compiler/src/index-jit.html
rename to aio/content/examples/aot-compiler/src/index-jit.html
diff --git a/aio/content/examples/cb-aot-compiler/src/index.html b/aio/content/examples/aot-compiler/src/index.html
similarity index 100%
rename from aio/content/examples/cb-aot-compiler/src/index.html
rename to aio/content/examples/aot-compiler/src/index.html
diff --git a/aio/content/examples/cb-aot-compiler/src/main-jit.ts b/aio/content/examples/aot-compiler/src/main-jit.ts
similarity index 100%
rename from aio/content/examples/cb-aot-compiler/src/main-jit.ts
rename to aio/content/examples/aot-compiler/src/main-jit.ts
diff --git a/aio/content/examples/cb-aot-compiler/src/main.ts b/aio/content/examples/aot-compiler/src/main.ts
similarity index 100%
rename from aio/content/examples/cb-aot-compiler/src/main.ts
rename to aio/content/examples/aot-compiler/src/main.ts
diff --git a/aio/content/examples/cb-aot-compiler/tsconfig-aot.json b/aio/content/examples/aot-compiler/tsconfig-aot.json
similarity index 100%
rename from aio/content/examples/cb-aot-compiler/tsconfig-aot.json
rename to aio/content/examples/aot-compiler/tsconfig-aot.json
diff --git a/aio/content/examples/cb-component-communication/.gitignore b/aio/content/examples/component-communication/.gitignore
similarity index 100%
rename from aio/content/examples/cb-component-communication/.gitignore
rename to aio/content/examples/component-communication/.gitignore
diff --git a/aio/content/examples/cb-component-communication/e2e-spec.ts b/aio/content/examples/component-communication/e2e-spec.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/e2e-spec.ts
rename to aio/content/examples/component-communication/e2e-spec.ts
diff --git a/aio/content/examples/cb-component-communication/example-config.json b/aio/content/examples/component-communication/example-config.json
similarity index 100%
rename from aio/content/examples/cb-component-communication/example-config.json
rename to aio/content/examples/component-communication/example-config.json
diff --git a/aio/content/examples/cb-component-communication/plnkr.json b/aio/content/examples/component-communication/plnkr.json
similarity index 100%
rename from aio/content/examples/cb-component-communication/plnkr.json
rename to aio/content/examples/component-communication/plnkr.json
diff --git a/aio/content/examples/cb-component-communication/src/app/app.component.html b/aio/content/examples/component-communication/src/app/app.component.html
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/app/app.component.html
rename to aio/content/examples/component-communication/src/app/app.component.html
diff --git a/aio/content/examples/cb-component-communication/src/app/app.component.ts b/aio/content/examples/component-communication/src/app/app.component.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/app/app.component.ts
rename to aio/content/examples/component-communication/src/app/app.component.ts
diff --git a/aio/content/examples/cb-component-communication/src/app/app.module.ts b/aio/content/examples/component-communication/src/app/app.module.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/app/app.module.ts
rename to aio/content/examples/component-communication/src/app/app.module.ts
diff --git a/aio/content/examples/cb-component-communication/src/app/astronaut.component.ts b/aio/content/examples/component-communication/src/app/astronaut.component.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/app/astronaut.component.ts
rename to aio/content/examples/component-communication/src/app/astronaut.component.ts
diff --git a/aio/content/examples/cb-component-communication/src/app/countdown-parent.component.ts b/aio/content/examples/component-communication/src/app/countdown-parent.component.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/app/countdown-parent.component.ts
rename to aio/content/examples/component-communication/src/app/countdown-parent.component.ts
diff --git a/aio/content/examples/cb-component-communication/src/app/countdown-timer.component.ts b/aio/content/examples/component-communication/src/app/countdown-timer.component.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/app/countdown-timer.component.ts
rename to aio/content/examples/component-communication/src/app/countdown-timer.component.ts
diff --git a/aio/content/examples/cb-component-communication/src/app/hero-child.component.ts b/aio/content/examples/component-communication/src/app/hero-child.component.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/app/hero-child.component.ts
rename to aio/content/examples/component-communication/src/app/hero-child.component.ts
diff --git a/aio/content/examples/cb-component-communication/src/app/hero-parent.component.ts b/aio/content/examples/component-communication/src/app/hero-parent.component.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/app/hero-parent.component.ts
rename to aio/content/examples/component-communication/src/app/hero-parent.component.ts
diff --git a/aio/content/examples/cb-component-communication/src/app/hero.ts b/aio/content/examples/component-communication/src/app/hero.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/app/hero.ts
rename to aio/content/examples/component-communication/src/app/hero.ts
diff --git a/aio/content/examples/cb-component-communication/src/app/mission.service.ts b/aio/content/examples/component-communication/src/app/mission.service.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/app/mission.service.ts
rename to aio/content/examples/component-communication/src/app/mission.service.ts
diff --git a/aio/content/examples/cb-component-communication/src/app/missioncontrol.component.ts b/aio/content/examples/component-communication/src/app/missioncontrol.component.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/app/missioncontrol.component.ts
rename to aio/content/examples/component-communication/src/app/missioncontrol.component.ts
diff --git a/aio/content/examples/cb-component-communication/src/app/name-child.component.ts b/aio/content/examples/component-communication/src/app/name-child.component.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/app/name-child.component.ts
rename to aio/content/examples/component-communication/src/app/name-child.component.ts
diff --git a/aio/content/examples/cb-component-communication/src/app/name-parent.component.ts b/aio/content/examples/component-communication/src/app/name-parent.component.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/app/name-parent.component.ts
rename to aio/content/examples/component-communication/src/app/name-parent.component.ts
diff --git a/aio/content/examples/cb-component-communication/src/app/version-child.component.ts b/aio/content/examples/component-communication/src/app/version-child.component.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/app/version-child.component.ts
rename to aio/content/examples/component-communication/src/app/version-child.component.ts
diff --git a/aio/content/examples/cb-component-communication/src/app/version-parent.component.ts b/aio/content/examples/component-communication/src/app/version-parent.component.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/app/version-parent.component.ts
rename to aio/content/examples/component-communication/src/app/version-parent.component.ts
diff --git a/aio/content/examples/cb-component-communication/src/app/voter.component.ts b/aio/content/examples/component-communication/src/app/voter.component.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/app/voter.component.ts
rename to aio/content/examples/component-communication/src/app/voter.component.ts
diff --git a/aio/content/examples/cb-component-communication/src/app/votetaker.component.ts b/aio/content/examples/component-communication/src/app/votetaker.component.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/app/votetaker.component.ts
rename to aio/content/examples/component-communication/src/app/votetaker.component.ts
diff --git a/aio/content/examples/cb-component-communication/src/demo.css b/aio/content/examples/component-communication/src/demo.css
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/demo.css
rename to aio/content/examples/component-communication/src/demo.css
diff --git a/aio/content/examples/cb-component-communication/src/index.html b/aio/content/examples/component-communication/src/index.html
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/index.html
rename to aio/content/examples/component-communication/src/index.html
diff --git a/aio/content/examples/cb-component-communication/src/main.ts b/aio/content/examples/component-communication/src/main.ts
similarity index 100%
rename from aio/content/examples/cb-component-communication/src/main.ts
rename to aio/content/examples/component-communication/src/main.ts
diff --git a/aio/content/examples/cb-dependency-injection/e2e-spec.ts b/aio/content/examples/dependency-injection-in-action/e2e-spec.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/e2e-spec.ts
rename to aio/content/examples/dependency-injection-in-action/e2e-spec.ts
diff --git a/aio/content/examples/cb-dependency-injection/example-config.json b/aio/content/examples/dependency-injection-in-action/example-config.json
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/example-config.json
rename to aio/content/examples/dependency-injection-in-action/example-config.json
diff --git a/aio/content/examples/cb-dependency-injection/plnkr.json b/aio/content/examples/dependency-injection-in-action/plnkr.json
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/plnkr.json
rename to aio/content/examples/dependency-injection-in-action/plnkr.json
diff --git a/aio/content/examples/cb-dependency-injection/src/app/app-routing.module.ts b/aio/content/examples/dependency-injection-in-action/src/app/app-routing.module.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/app-routing.module.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/app-routing.module.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/app.component.html b/aio/content/examples/dependency-injection-in-action/src/app/app.component.html
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/app.component.html
rename to aio/content/examples/dependency-injection-in-action/src/app/app.component.html
diff --git a/aio/content/examples/cb-dependency-injection/src/app/app.component.ts b/aio/content/examples/dependency-injection-in-action/src/app/app.component.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/app.component.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/app.component.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/app.module.ts b/aio/content/examples/dependency-injection-in-action/src/app/app.module.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/app.module.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/app.module.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/date-logger.service.ts b/aio/content/examples/dependency-injection-in-action/src/app/date-logger.service.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/date-logger.service.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/date-logger.service.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/hero-bio.component.ts b/aio/content/examples/dependency-injection-in-action/src/app/hero-bio.component.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/hero-bio.component.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/hero-bio.component.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/hero-bios.component.ts b/aio/content/examples/dependency-injection-in-action/src/app/hero-bios.component.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/hero-bios.component.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/hero-bios.component.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/hero-cache.service.ts b/aio/content/examples/dependency-injection-in-action/src/app/hero-cache.service.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/hero-cache.service.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/hero-cache.service.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/hero-contact.component.ts b/aio/content/examples/dependency-injection-in-action/src/app/hero-contact.component.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/hero-contact.component.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/hero-contact.component.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/hero-data.ts b/aio/content/examples/dependency-injection-in-action/src/app/hero-data.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/hero-data.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/hero-data.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/hero-of-the-month.component.1.ts b/aio/content/examples/dependency-injection-in-action/src/app/hero-of-the-month.component.1.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/hero-of-the-month.component.1.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/hero-of-the-month.component.1.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/hero-of-the-month.component.html b/aio/content/examples/dependency-injection-in-action/src/app/hero-of-the-month.component.html
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/hero-of-the-month.component.html
rename to aio/content/examples/dependency-injection-in-action/src/app/hero-of-the-month.component.html
diff --git a/aio/content/examples/cb-dependency-injection/src/app/hero-of-the-month.component.ts b/aio/content/examples/dependency-injection-in-action/src/app/hero-of-the-month.component.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/hero-of-the-month.component.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/hero-of-the-month.component.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/hero.service.ts b/aio/content/examples/dependency-injection-in-action/src/app/hero.service.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/hero.service.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/hero.service.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/hero.ts b/aio/content/examples/dependency-injection-in-action/src/app/hero.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/hero.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/hero.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/highlight.directive.ts b/aio/content/examples/dependency-injection-in-action/src/app/highlight.directive.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/highlight.directive.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/highlight.directive.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/logger.service.ts b/aio/content/examples/dependency-injection-in-action/src/app/logger.service.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/logger.service.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/logger.service.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/minimal-logger.service.ts b/aio/content/examples/dependency-injection-in-action/src/app/minimal-logger.service.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/minimal-logger.service.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/minimal-logger.service.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/parent-finder.component.ts b/aio/content/examples/dependency-injection-in-action/src/app/parent-finder.component.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/parent-finder.component.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/parent-finder.component.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/runners-up.ts b/aio/content/examples/dependency-injection-in-action/src/app/runners-up.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/runners-up.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/runners-up.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/sorted-heroes.component.ts b/aio/content/examples/dependency-injection-in-action/src/app/sorted-heroes.component.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/sorted-heroes.component.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/sorted-heroes.component.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/user-context.service.ts b/aio/content/examples/dependency-injection-in-action/src/app/user-context.service.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/user-context.service.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/user-context.service.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/app/user.service.ts b/aio/content/examples/dependency-injection-in-action/src/app/user.service.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/app/user.service.ts
rename to aio/content/examples/dependency-injection-in-action/src/app/user.service.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/index.html b/aio/content/examples/dependency-injection-in-action/src/index.html
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/index.html
rename to aio/content/examples/dependency-injection-in-action/src/index.html
diff --git a/aio/content/examples/cb-dependency-injection/src/main.ts b/aio/content/examples/dependency-injection-in-action/src/main.ts
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/main.ts
rename to aio/content/examples/dependency-injection-in-action/src/main.ts
diff --git a/aio/content/examples/cb-dependency-injection/src/sample.css b/aio/content/examples/dependency-injection-in-action/src/sample.css
similarity index 100%
rename from aio/content/examples/cb-dependency-injection/src/sample.css
rename to aio/content/examples/dependency-injection-in-action/src/sample.css
diff --git a/aio/content/examples/cb-dynamic-component-loader/e2e-spec.ts b/aio/content/examples/dynamic-component-loader/e2e-spec.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-component-loader/e2e-spec.ts
rename to aio/content/examples/dynamic-component-loader/e2e-spec.ts
diff --git a/aio/content/examples/cb-dynamic-component-loader/example-config.json b/aio/content/examples/dynamic-component-loader/example-config.json
similarity index 100%
rename from aio/content/examples/cb-dynamic-component-loader/example-config.json
rename to aio/content/examples/dynamic-component-loader/example-config.json
diff --git a/aio/content/examples/cb-dynamic-component-loader/plnkr.json b/aio/content/examples/dynamic-component-loader/plnkr.json
similarity index 100%
rename from aio/content/examples/cb-dynamic-component-loader/plnkr.json
rename to aio/content/examples/dynamic-component-loader/plnkr.json
diff --git a/aio/content/examples/cb-dynamic-component-loader/src/app/ad-banner.component.ts b/aio/content/examples/dynamic-component-loader/src/app/ad-banner.component.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-component-loader/src/app/ad-banner.component.ts
rename to aio/content/examples/dynamic-component-loader/src/app/ad-banner.component.ts
diff --git a/aio/content/examples/cb-dynamic-component-loader/src/app/ad-item.ts b/aio/content/examples/dynamic-component-loader/src/app/ad-item.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-component-loader/src/app/ad-item.ts
rename to aio/content/examples/dynamic-component-loader/src/app/ad-item.ts
diff --git a/aio/content/examples/cb-dynamic-component-loader/src/app/ad.component.ts b/aio/content/examples/dynamic-component-loader/src/app/ad.component.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-component-loader/src/app/ad.component.ts
rename to aio/content/examples/dynamic-component-loader/src/app/ad.component.ts
diff --git a/aio/content/examples/cb-dynamic-component-loader/src/app/ad.directive.ts b/aio/content/examples/dynamic-component-loader/src/app/ad.directive.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-component-loader/src/app/ad.directive.ts
rename to aio/content/examples/dynamic-component-loader/src/app/ad.directive.ts
diff --git a/aio/content/examples/cb-dynamic-component-loader/src/app/ad.service.ts b/aio/content/examples/dynamic-component-loader/src/app/ad.service.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-component-loader/src/app/ad.service.ts
rename to aio/content/examples/dynamic-component-loader/src/app/ad.service.ts
diff --git a/aio/content/examples/cb-dynamic-component-loader/src/app/app.component.ts b/aio/content/examples/dynamic-component-loader/src/app/app.component.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-component-loader/src/app/app.component.ts
rename to aio/content/examples/dynamic-component-loader/src/app/app.component.ts
diff --git a/aio/content/examples/cb-dynamic-component-loader/src/app/app.module.ts b/aio/content/examples/dynamic-component-loader/src/app/app.module.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-component-loader/src/app/app.module.ts
rename to aio/content/examples/dynamic-component-loader/src/app/app.module.ts
diff --git a/aio/content/examples/cb-dynamic-component-loader/src/app/hero-job-ad.component.ts b/aio/content/examples/dynamic-component-loader/src/app/hero-job-ad.component.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-component-loader/src/app/hero-job-ad.component.ts
rename to aio/content/examples/dynamic-component-loader/src/app/hero-job-ad.component.ts
diff --git a/aio/content/examples/cb-dynamic-component-loader/src/app/hero-profile.component.ts b/aio/content/examples/dynamic-component-loader/src/app/hero-profile.component.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-component-loader/src/app/hero-profile.component.ts
rename to aio/content/examples/dynamic-component-loader/src/app/hero-profile.component.ts
diff --git a/aio/content/examples/cb-dynamic-component-loader/src/index.html b/aio/content/examples/dynamic-component-loader/src/index.html
similarity index 100%
rename from aio/content/examples/cb-dynamic-component-loader/src/index.html
rename to aio/content/examples/dynamic-component-loader/src/index.html
diff --git a/aio/content/examples/cb-dynamic-component-loader/src/main.ts b/aio/content/examples/dynamic-component-loader/src/main.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-component-loader/src/main.ts
rename to aio/content/examples/dynamic-component-loader/src/main.ts
diff --git a/aio/content/examples/cb-dynamic-component-loader/src/sample.css b/aio/content/examples/dynamic-component-loader/src/sample.css
similarity index 100%
rename from aio/content/examples/cb-dynamic-component-loader/src/sample.css
rename to aio/content/examples/dynamic-component-loader/src/sample.css
diff --git a/aio/content/examples/cb-dynamic-form/e2e-spec.ts b/aio/content/examples/dynamic-form/e2e-spec.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-form/e2e-spec.ts
rename to aio/content/examples/dynamic-form/e2e-spec.ts
diff --git a/aio/content/examples/cb-dynamic-form/example-config.json b/aio/content/examples/dynamic-form/example-config.json
similarity index 100%
rename from aio/content/examples/cb-dynamic-form/example-config.json
rename to aio/content/examples/dynamic-form/example-config.json
diff --git a/aio/content/examples/cb-dynamic-form/plnkr.json b/aio/content/examples/dynamic-form/plnkr.json
similarity index 100%
rename from aio/content/examples/cb-dynamic-form/plnkr.json
rename to aio/content/examples/dynamic-form/plnkr.json
diff --git a/aio/content/examples/cb-dynamic-form/src/app/app.component.ts b/aio/content/examples/dynamic-form/src/app/app.component.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-form/src/app/app.component.ts
rename to aio/content/examples/dynamic-form/src/app/app.component.ts
diff --git a/aio/content/examples/cb-dynamic-form/src/app/app.module.ts b/aio/content/examples/dynamic-form/src/app/app.module.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-form/src/app/app.module.ts
rename to aio/content/examples/dynamic-form/src/app/app.module.ts
diff --git a/aio/content/examples/cb-dynamic-form/src/app/dynamic-form-question.component.html b/aio/content/examples/dynamic-form/src/app/dynamic-form-question.component.html
similarity index 100%
rename from aio/content/examples/cb-dynamic-form/src/app/dynamic-form-question.component.html
rename to aio/content/examples/dynamic-form/src/app/dynamic-form-question.component.html
diff --git a/aio/content/examples/cb-dynamic-form/src/app/dynamic-form-question.component.ts b/aio/content/examples/dynamic-form/src/app/dynamic-form-question.component.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-form/src/app/dynamic-form-question.component.ts
rename to aio/content/examples/dynamic-form/src/app/dynamic-form-question.component.ts
diff --git a/aio/content/examples/cb-dynamic-form/src/app/dynamic-form.component.html b/aio/content/examples/dynamic-form/src/app/dynamic-form.component.html
similarity index 100%
rename from aio/content/examples/cb-dynamic-form/src/app/dynamic-form.component.html
rename to aio/content/examples/dynamic-form/src/app/dynamic-form.component.html
diff --git a/aio/content/examples/cb-dynamic-form/src/app/dynamic-form.component.ts b/aio/content/examples/dynamic-form/src/app/dynamic-form.component.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-form/src/app/dynamic-form.component.ts
rename to aio/content/examples/dynamic-form/src/app/dynamic-form.component.ts
diff --git a/aio/content/examples/cb-dynamic-form/src/app/question-base.ts b/aio/content/examples/dynamic-form/src/app/question-base.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-form/src/app/question-base.ts
rename to aio/content/examples/dynamic-form/src/app/question-base.ts
diff --git a/aio/content/examples/cb-dynamic-form/src/app/question-control.service.ts b/aio/content/examples/dynamic-form/src/app/question-control.service.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-form/src/app/question-control.service.ts
rename to aio/content/examples/dynamic-form/src/app/question-control.service.ts
diff --git a/aio/content/examples/cb-dynamic-form/src/app/question-dropdown.ts b/aio/content/examples/dynamic-form/src/app/question-dropdown.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-form/src/app/question-dropdown.ts
rename to aio/content/examples/dynamic-form/src/app/question-dropdown.ts
diff --git a/aio/content/examples/cb-dynamic-form/src/app/question-textbox.ts b/aio/content/examples/dynamic-form/src/app/question-textbox.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-form/src/app/question-textbox.ts
rename to aio/content/examples/dynamic-form/src/app/question-textbox.ts
diff --git a/aio/content/examples/cb-dynamic-form/src/app/question.service.ts b/aio/content/examples/dynamic-form/src/app/question.service.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-form/src/app/question.service.ts
rename to aio/content/examples/dynamic-form/src/app/question.service.ts
diff --git a/aio/content/examples/cb-dynamic-form/src/index.html b/aio/content/examples/dynamic-form/src/index.html
similarity index 100%
rename from aio/content/examples/cb-dynamic-form/src/index.html
rename to aio/content/examples/dynamic-form/src/index.html
diff --git a/aio/content/examples/cb-dynamic-form/src/main.ts b/aio/content/examples/dynamic-form/src/main.ts
similarity index 100%
rename from aio/content/examples/cb-dynamic-form/src/main.ts
rename to aio/content/examples/dynamic-form/src/main.ts
diff --git a/aio/content/examples/cb-dynamic-form/src/sample.css b/aio/content/examples/dynamic-form/src/sample.css
similarity index 100%
rename from aio/content/examples/cb-dynamic-form/src/sample.css
rename to aio/content/examples/dynamic-form/src/sample.css
diff --git a/aio/content/examples/cb-form-validation/e2e-spec.ts b/aio/content/examples/form-validation/e2e-spec.ts
similarity index 100%
rename from aio/content/examples/cb-form-validation/e2e-spec.ts
rename to aio/content/examples/form-validation/e2e-spec.ts
diff --git a/aio/content/examples/cb-form-validation/example-config.json b/aio/content/examples/form-validation/example-config.json
similarity index 100%
rename from aio/content/examples/cb-form-validation/example-config.json
rename to aio/content/examples/form-validation/example-config.json
diff --git a/aio/content/examples/cb-form-validation/plnkr.json b/aio/content/examples/form-validation/plnkr.json
similarity index 100%
rename from aio/content/examples/cb-form-validation/plnkr.json
rename to aio/content/examples/form-validation/plnkr.json
diff --git a/aio/content/examples/cb-form-validation/src/app/app.component.ts b/aio/content/examples/form-validation/src/app/app.component.ts
similarity index 100%
rename from aio/content/examples/cb-form-validation/src/app/app.component.ts
rename to aio/content/examples/form-validation/src/app/app.component.ts
diff --git a/aio/content/examples/cb-form-validation/src/app/app.module.ts b/aio/content/examples/form-validation/src/app/app.module.ts
similarity index 100%
rename from aio/content/examples/cb-form-validation/src/app/app.module.ts
rename to aio/content/examples/form-validation/src/app/app.module.ts
diff --git a/aio/content/examples/cb-form-validation/src/app/reactive/hero-form-reactive.component.html b/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.html
similarity index 100%
rename from aio/content/examples/cb-form-validation/src/app/reactive/hero-form-reactive.component.html
rename to aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.html
diff --git a/aio/content/examples/cb-form-validation/src/app/reactive/hero-form-reactive.component.ts b/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.ts
similarity index 100%
rename from aio/content/examples/cb-form-validation/src/app/reactive/hero-form-reactive.component.ts
rename to aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.ts
diff --git a/aio/content/examples/cb-form-validation/src/app/reactive/hero-form-reactive.module.ts b/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.module.ts
similarity index 100%
rename from aio/content/examples/cb-form-validation/src/app/reactive/hero-form-reactive.module.ts
rename to aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.module.ts
diff --git a/aio/content/examples/cb-form-validation/src/app/shared/forbidden-name.directive.ts b/aio/content/examples/form-validation/src/app/shared/forbidden-name.directive.ts
similarity index 100%
rename from aio/content/examples/cb-form-validation/src/app/shared/forbidden-name.directive.ts
rename to aio/content/examples/form-validation/src/app/shared/forbidden-name.directive.ts
diff --git a/aio/content/examples/cb-form-validation/src/app/shared/hero.ts b/aio/content/examples/form-validation/src/app/shared/hero.ts
similarity index 100%
rename from aio/content/examples/cb-form-validation/src/app/shared/hero.ts
rename to aio/content/examples/form-validation/src/app/shared/hero.ts
diff --git a/aio/content/examples/cb-form-validation/src/app/shared/shared.module.ts b/aio/content/examples/form-validation/src/app/shared/shared.module.ts
similarity index 100%
rename from aio/content/examples/cb-form-validation/src/app/shared/shared.module.ts
rename to aio/content/examples/form-validation/src/app/shared/shared.module.ts
diff --git a/aio/content/examples/cb-form-validation/src/app/shared/submitted.component.ts b/aio/content/examples/form-validation/src/app/shared/submitted.component.ts
similarity index 100%
rename from aio/content/examples/cb-form-validation/src/app/shared/submitted.component.ts
rename to aio/content/examples/form-validation/src/app/shared/submitted.component.ts
diff --git a/aio/content/examples/cb-form-validation/src/app/template/hero-form-template.module.ts b/aio/content/examples/form-validation/src/app/template/hero-form-template.module.ts
similarity index 100%
rename from aio/content/examples/cb-form-validation/src/app/template/hero-form-template.module.ts
rename to aio/content/examples/form-validation/src/app/template/hero-form-template.module.ts
diff --git a/aio/content/examples/cb-form-validation/src/app/template/hero-form-template1.component.html b/aio/content/examples/form-validation/src/app/template/hero-form-template1.component.html
similarity index 100%
rename from aio/content/examples/cb-form-validation/src/app/template/hero-form-template1.component.html
rename to aio/content/examples/form-validation/src/app/template/hero-form-template1.component.html
diff --git a/aio/content/examples/cb-form-validation/src/app/template/hero-form-template1.component.ts b/aio/content/examples/form-validation/src/app/template/hero-form-template1.component.ts
similarity index 100%
rename from aio/content/examples/cb-form-validation/src/app/template/hero-form-template1.component.ts
rename to aio/content/examples/form-validation/src/app/template/hero-form-template1.component.ts
diff --git a/aio/content/examples/cb-form-validation/src/app/template/hero-form-template2.component.html b/aio/content/examples/form-validation/src/app/template/hero-form-template2.component.html
similarity index 100%
rename from aio/content/examples/cb-form-validation/src/app/template/hero-form-template2.component.html
rename to aio/content/examples/form-validation/src/app/template/hero-form-template2.component.html
diff --git a/aio/content/examples/cb-form-validation/src/app/template/hero-form-template2.component.ts b/aio/content/examples/form-validation/src/app/template/hero-form-template2.component.ts
similarity index 100%
rename from aio/content/examples/cb-form-validation/src/app/template/hero-form-template2.component.ts
rename to aio/content/examples/form-validation/src/app/template/hero-form-template2.component.ts
diff --git a/aio/content/examples/cb-form-validation/src/forms.css b/aio/content/examples/form-validation/src/forms.css
similarity index 100%
rename from aio/content/examples/cb-form-validation/src/forms.css
rename to aio/content/examples/form-validation/src/forms.css
diff --git a/aio/content/examples/cb-form-validation/src/index.html b/aio/content/examples/form-validation/src/index.html
similarity index 100%
rename from aio/content/examples/cb-form-validation/src/index.html
rename to aio/content/examples/form-validation/src/index.html
diff --git a/aio/content/examples/cb-form-validation/src/main.ts b/aio/content/examples/form-validation/src/main.ts
similarity index 100%
rename from aio/content/examples/cb-form-validation/src/main.ts
rename to aio/content/examples/form-validation/src/main.ts
diff --git a/aio/content/examples/cb-i18n/.gitignore b/aio/content/examples/i18n/.gitignore
similarity index 100%
rename from aio/content/examples/cb-i18n/.gitignore
rename to aio/content/examples/i18n/.gitignore
diff --git a/aio/content/examples/cb-i18n/e2e-spec.ts b/aio/content/examples/i18n/e2e-spec.ts
similarity index 100%
rename from aio/content/examples/cb-i18n/e2e-spec.ts
rename to aio/content/examples/i18n/e2e-spec.ts
diff --git a/aio/content/examples/cb-i18n/example-config.json b/aio/content/examples/i18n/example-config.json
similarity index 100%
rename from aio/content/examples/cb-i18n/example-config.json
rename to aio/content/examples/i18n/example-config.json
diff --git a/aio/content/examples/cb-i18n/messages.xlf b/aio/content/examples/i18n/messages.xlf
similarity index 100%
rename from aio/content/examples/cb-i18n/messages.xlf
rename to aio/content/examples/i18n/messages.xlf
diff --git a/aio/content/examples/cb-i18n/plnkr.json b/aio/content/examples/i18n/plnkr.json
similarity index 100%
rename from aio/content/examples/cb-i18n/plnkr.json
rename to aio/content/examples/i18n/plnkr.json
diff --git a/aio/content/examples/cb-i18n/src/app/app.component.1.html b/aio/content/examples/i18n/src/app/app.component.1.html
similarity index 100%
rename from aio/content/examples/cb-i18n/src/app/app.component.1.html
rename to aio/content/examples/i18n/src/app/app.component.1.html
diff --git a/aio/content/examples/cb-i18n/src/app/app.component.html b/aio/content/examples/i18n/src/app/app.component.html
similarity index 100%
rename from aio/content/examples/cb-i18n/src/app/app.component.html
rename to aio/content/examples/i18n/src/app/app.component.html
diff --git a/aio/content/examples/cb-i18n/src/app/app.component.ts b/aio/content/examples/i18n/src/app/app.component.ts
similarity index 100%
rename from aio/content/examples/cb-i18n/src/app/app.component.ts
rename to aio/content/examples/i18n/src/app/app.component.ts
diff --git a/aio/content/examples/cb-i18n/src/app/app.module.ts b/aio/content/examples/i18n/src/app/app.module.ts
similarity index 100%
rename from aio/content/examples/cb-i18n/src/app/app.module.ts
rename to aio/content/examples/i18n/src/app/app.module.ts
diff --git a/aio/content/examples/cb-i18n/src/app/i18n-providers.ts b/aio/content/examples/i18n/src/app/i18n-providers.ts
similarity index 100%
rename from aio/content/examples/cb-i18n/src/app/i18n-providers.ts
rename to aio/content/examples/i18n/src/app/i18n-providers.ts
diff --git a/aio/content/examples/cb-i18n/src/index.html b/aio/content/examples/i18n/src/index.html
similarity index 100%
rename from aio/content/examples/cb-i18n/src/index.html
rename to aio/content/examples/i18n/src/index.html
diff --git a/aio/content/examples/cb-i18n/src/locale/messages.es.xlf b/aio/content/examples/i18n/src/locale/messages.es.xlf
similarity index 100%
rename from aio/content/examples/cb-i18n/src/locale/messages.es.xlf
rename to aio/content/examples/i18n/src/locale/messages.es.xlf
diff --git a/aio/content/examples/cb-i18n/src/locale/messages.es.xlf.html b/aio/content/examples/i18n/src/locale/messages.es.xlf.html
similarity index 100%
rename from aio/content/examples/cb-i18n/src/locale/messages.es.xlf.html
rename to aio/content/examples/i18n/src/locale/messages.es.xlf.html
diff --git a/aio/content/examples/cb-i18n/src/main.1.ts b/aio/content/examples/i18n/src/main.1.ts
similarity index 100%
rename from aio/content/examples/cb-i18n/src/main.1.ts
rename to aio/content/examples/i18n/src/main.1.ts
diff --git a/aio/content/examples/cb-i18n/src/main.ts b/aio/content/examples/i18n/src/main.ts
similarity index 100%
rename from aio/content/examples/cb-i18n/src/main.ts
rename to aio/content/examples/i18n/src/main.ts
diff --git a/aio/content/examples/cb-i18n/src/systemjs-text-plugin.js b/aio/content/examples/i18n/src/systemjs-text-plugin.js
similarity index 100%
rename from aio/content/examples/cb-i18n/src/systemjs-text-plugin.js
rename to aio/content/examples/i18n/src/systemjs-text-plugin.js
diff --git a/aio/content/examples/cb-set-document-title/e2e-spec.ts b/aio/content/examples/set-document-title/e2e-spec.ts
similarity index 84%
rename from aio/content/examples/cb-set-document-title/e2e-spec.ts
rename to aio/content/examples/set-document-title/e2e-spec.ts
index 801b732995..b86deb9aa6 100644
--- a/aio/content/examples/cb-set-document-title/e2e-spec.ts
+++ b/aio/content/examples/set-document-title/e2e-spec.ts
@@ -1,8 +1,7 @@
-'use strict'; // necessary for es6 output in node 
+'use strict'; // necessary for es6 output in node
 
 import { browser, element, by, ElementFinder } from 'protractor';
 
-// gulp run-e2e-tests --filter=cb-set-document-title
 describe('Set Document Title', function () {
 
     beforeAll(function () {
diff --git a/aio/content/examples/cb-set-document-title/example-config.json b/aio/content/examples/set-document-title/example-config.json
similarity index 100%
rename from aio/content/examples/cb-set-document-title/example-config.json
rename to aio/content/examples/set-document-title/example-config.json
diff --git a/aio/content/examples/cb-set-document-title/plnkr.json b/aio/content/examples/set-document-title/plnkr.json
similarity index 100%
rename from aio/content/examples/cb-set-document-title/plnkr.json
rename to aio/content/examples/set-document-title/plnkr.json
diff --git a/aio/content/examples/cb-set-document-title/src/app/app.component.ts b/aio/content/examples/set-document-title/src/app/app.component.ts
similarity index 100%
rename from aio/content/examples/cb-set-document-title/src/app/app.component.ts
rename to aio/content/examples/set-document-title/src/app/app.component.ts
diff --git a/aio/content/examples/cb-set-document-title/src/app/app.module.ts b/aio/content/examples/set-document-title/src/app/app.module.ts
similarity index 100%
rename from aio/content/examples/cb-set-document-title/src/app/app.module.ts
rename to aio/content/examples/set-document-title/src/app/app.module.ts
diff --git a/aio/content/examples/cb-set-document-title/src/index.html b/aio/content/examples/set-document-title/src/index.html
similarity index 100%
rename from aio/content/examples/cb-set-document-title/src/index.html
rename to aio/content/examples/set-document-title/src/index.html
diff --git a/aio/content/examples/cb-set-document-title/src/main.ts b/aio/content/examples/set-document-title/src/main.ts
similarity index 100%
rename from aio/content/examples/cb-set-document-title/src/main.ts
rename to aio/content/examples/set-document-title/src/main.ts
diff --git a/aio/content/examples/style-guide/.gitignore b/aio/content/examples/styleguide/.gitignore
similarity index 100%
rename from aio/content/examples/style-guide/.gitignore
rename to aio/content/examples/styleguide/.gitignore
diff --git a/aio/content/examples/style-guide/e2e-spec.ts b/aio/content/examples/styleguide/e2e-spec.ts
similarity index 100%
rename from aio/content/examples/style-guide/e2e-spec.ts
rename to aio/content/examples/styleguide/e2e-spec.ts
diff --git a/aio/content/examples/cb-ts-to-js/ts/example-config.json b/aio/content/examples/styleguide/example-config.json
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/example-config.json
rename to aio/content/examples/styleguide/example-config.json
diff --git a/aio/content/examples/style-guide/plnkr.json b/aio/content/examples/styleguide/plnkr.json
similarity index 100%
rename from aio/content/examples/style-guide/plnkr.json
rename to aio/content/examples/styleguide/plnkr.json
diff --git a/aio/content/examples/style-guide/src/01-01/app/app.component.css b/aio/content/examples/styleguide/src/01-01/app/app.component.css
similarity index 100%
rename from aio/content/examples/style-guide/src/01-01/app/app.component.css
rename to aio/content/examples/styleguide/src/01-01/app/app.component.css
diff --git a/aio/content/examples/style-guide/src/01-01/app/app.component.ts b/aio/content/examples/styleguide/src/01-01/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/01-01/app/app.component.ts
rename to aio/content/examples/styleguide/src/01-01/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/01-01/app/app.module.ts b/aio/content/examples/styleguide/src/01-01/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/01-01/app/app.module.ts
rename to aio/content/examples/styleguide/src/01-01/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/01-01/app/heroes/hero.component.avoid.ts b/aio/content/examples/styleguide/src/01-01/app/heroes/hero.component.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/01-01/app/heroes/hero.component.avoid.ts
rename to aio/content/examples/styleguide/src/01-01/app/heroes/hero.component.avoid.ts
diff --git a/aio/content/examples/style-guide/src/01-01/app/heroes/heroes.component.ts b/aio/content/examples/styleguide/src/01-01/app/heroes/heroes.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/01-01/app/heroes/heroes.component.ts
rename to aio/content/examples/styleguide/src/01-01/app/heroes/heroes.component.ts
diff --git a/aio/content/examples/style-guide/src/01-01/app/heroes/index.ts b/aio/content/examples/styleguide/src/01-01/app/heroes/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/01-01/app/heroes/index.ts
rename to aio/content/examples/styleguide/src/01-01/app/heroes/index.ts
diff --git a/aio/content/examples/style-guide/src/01-01/app/heroes/shared/hero.model.ts b/aio/content/examples/styleguide/src/01-01/app/heroes/shared/hero.model.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/01-01/app/heroes/shared/hero.model.ts
rename to aio/content/examples/styleguide/src/01-01/app/heroes/shared/hero.model.ts
diff --git a/aio/content/examples/style-guide/src/01-01/app/heroes/shared/hero.service.ts b/aio/content/examples/styleguide/src/01-01/app/heroes/shared/hero.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/01-01/app/heroes/shared/hero.service.ts
rename to aio/content/examples/styleguide/src/01-01/app/heroes/shared/hero.service.ts
diff --git a/aio/content/examples/style-guide/src/01-01/app/heroes/shared/index.ts b/aio/content/examples/styleguide/src/01-01/app/heroes/shared/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/01-01/app/heroes/shared/index.ts
rename to aio/content/examples/styleguide/src/01-01/app/heroes/shared/index.ts
diff --git a/aio/content/examples/style-guide/src/01-01/app/heroes/shared/mock-heroes.ts b/aio/content/examples/styleguide/src/01-01/app/heroes/shared/mock-heroes.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/01-01/app/heroes/shared/mock-heroes.ts
rename to aio/content/examples/styleguide/src/01-01/app/heroes/shared/mock-heroes.ts
diff --git a/aio/content/examples/style-guide/src/01-01/app/index.ts b/aio/content/examples/styleguide/src/01-01/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/01-01/app/index.ts
rename to aio/content/examples/styleguide/src/01-01/app/index.ts
diff --git a/aio/content/examples/style-guide/src/01-01/main.ts b/aio/content/examples/styleguide/src/01-01/main.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/01-01/main.ts
rename to aio/content/examples/styleguide/src/01-01/main.ts
diff --git a/aio/content/examples/style-guide/src/02-05/app/app.component.ts b/aio/content/examples/styleguide/src/02-05/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-05/app/app.component.ts
rename to aio/content/examples/styleguide/src/02-05/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/02-05/app/app.module.ts b/aio/content/examples/styleguide/src/02-05/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-05/app/app.module.ts
rename to aio/content/examples/styleguide/src/02-05/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/02-05/main.ts b/aio/content/examples/styleguide/src/02-05/main.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-05/main.ts
rename to aio/content/examples/styleguide/src/02-05/main.ts
diff --git a/aio/content/examples/style-guide/src/02-07/app/app.component.ts b/aio/content/examples/styleguide/src/02-07/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-07/app/app.component.ts
rename to aio/content/examples/styleguide/src/02-07/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/02-07/app/app.module.ts b/aio/content/examples/styleguide/src/02-07/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-07/app/app.module.ts
rename to aio/content/examples/styleguide/src/02-07/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/02-07/app/heroes/hero.component.avoid.ts b/aio/content/examples/styleguide/src/02-07/app/heroes/hero.component.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-07/app/heroes/hero.component.avoid.ts
rename to aio/content/examples/styleguide/src/02-07/app/heroes/hero.component.avoid.ts
diff --git a/aio/content/examples/style-guide/src/02-07/app/heroes/hero.component.ts b/aio/content/examples/styleguide/src/02-07/app/heroes/hero.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-07/app/heroes/hero.component.ts
rename to aio/content/examples/styleguide/src/02-07/app/heroes/hero.component.ts
diff --git a/aio/content/examples/style-guide/src/02-07/app/heroes/index.ts b/aio/content/examples/styleguide/src/02-07/app/heroes/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-07/app/heroes/index.ts
rename to aio/content/examples/styleguide/src/02-07/app/heroes/index.ts
diff --git a/aio/content/examples/style-guide/src/02-07/app/index.ts b/aio/content/examples/styleguide/src/02-07/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-07/app/index.ts
rename to aio/content/examples/styleguide/src/02-07/app/index.ts
diff --git a/aio/content/examples/style-guide/src/02-07/app/users/index.ts b/aio/content/examples/styleguide/src/02-07/app/users/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-07/app/users/index.ts
rename to aio/content/examples/styleguide/src/02-07/app/users/index.ts
diff --git a/aio/content/examples/style-guide/src/02-07/app/users/users.component.avoid.ts b/aio/content/examples/styleguide/src/02-07/app/users/users.component.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-07/app/users/users.component.avoid.ts
rename to aio/content/examples/styleguide/src/02-07/app/users/users.component.avoid.ts
diff --git a/aio/content/examples/style-guide/src/02-07/app/users/users.component.ts b/aio/content/examples/styleguide/src/02-07/app/users/users.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-07/app/users/users.component.ts
rename to aio/content/examples/styleguide/src/02-07/app/users/users.component.ts
diff --git a/aio/content/examples/style-guide/src/02-08/app/app.component.ts b/aio/content/examples/styleguide/src/02-08/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-08/app/app.component.ts
rename to aio/content/examples/styleguide/src/02-08/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/02-08/app/app.module.ts b/aio/content/examples/styleguide/src/02-08/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-08/app/app.module.ts
rename to aio/content/examples/styleguide/src/02-08/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/02-08/app/index.ts b/aio/content/examples/styleguide/src/02-08/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-08/app/index.ts
rename to aio/content/examples/styleguide/src/02-08/app/index.ts
diff --git a/aio/content/examples/style-guide/src/02-08/app/shared/index.ts b/aio/content/examples/styleguide/src/02-08/app/shared/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-08/app/shared/index.ts
rename to aio/content/examples/styleguide/src/02-08/app/shared/index.ts
diff --git a/aio/content/examples/style-guide/src/02-08/app/shared/input-highlight.directive.ts b/aio/content/examples/styleguide/src/02-08/app/shared/input-highlight.directive.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-08/app/shared/input-highlight.directive.ts
rename to aio/content/examples/styleguide/src/02-08/app/shared/input-highlight.directive.ts
diff --git a/aio/content/examples/style-guide/src/02-08/app/shared/validate.directive.avoid.ts b/aio/content/examples/styleguide/src/02-08/app/shared/validate.directive.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-08/app/shared/validate.directive.avoid.ts
rename to aio/content/examples/styleguide/src/02-08/app/shared/validate.directive.avoid.ts
diff --git a/aio/content/examples/style-guide/src/02-08/app/shared/validate.directive.ts b/aio/content/examples/styleguide/src/02-08/app/shared/validate.directive.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/02-08/app/shared/validate.directive.ts
rename to aio/content/examples/styleguide/src/02-08/app/shared/validate.directive.ts
diff --git a/aio/content/examples/style-guide/src/03-01/app/app.component.ts b/aio/content/examples/styleguide/src/03-01/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-01/app/app.component.ts
rename to aio/content/examples/styleguide/src/03-01/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/03-01/app/app.module.ts b/aio/content/examples/styleguide/src/03-01/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-01/app/app.module.ts
rename to aio/content/examples/styleguide/src/03-01/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/03-01/app/core/exception.service.avoid.ts b/aio/content/examples/styleguide/src/03-01/app/core/exception.service.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-01/app/core/exception.service.avoid.ts
rename to aio/content/examples/styleguide/src/03-01/app/core/exception.service.avoid.ts
diff --git a/aio/content/examples/style-guide/src/03-01/app/core/exception.service.ts b/aio/content/examples/styleguide/src/03-01/app/core/exception.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-01/app/core/exception.service.ts
rename to aio/content/examples/styleguide/src/03-01/app/core/exception.service.ts
diff --git a/aio/content/examples/style-guide/src/03-01/app/core/index.ts b/aio/content/examples/styleguide/src/03-01/app/core/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-01/app/core/index.ts
rename to aio/content/examples/styleguide/src/03-01/app/core/index.ts
diff --git a/aio/content/examples/style-guide/src/03-01/app/index.ts b/aio/content/examples/styleguide/src/03-01/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-01/app/index.ts
rename to aio/content/examples/styleguide/src/03-01/app/index.ts
diff --git a/aio/content/examples/style-guide/src/03-02/app/app.component.ts b/aio/content/examples/styleguide/src/03-02/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-02/app/app.component.ts
rename to aio/content/examples/styleguide/src/03-02/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/03-02/app/app.module.ts b/aio/content/examples/styleguide/src/03-02/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-02/app/app.module.ts
rename to aio/content/examples/styleguide/src/03-02/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/03-02/app/core/data.service.ts b/aio/content/examples/styleguide/src/03-02/app/core/data.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-02/app/core/data.service.ts
rename to aio/content/examples/styleguide/src/03-02/app/core/data.service.ts
diff --git a/aio/content/examples/style-guide/src/03-02/app/core/index.ts b/aio/content/examples/styleguide/src/03-02/app/core/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-02/app/core/index.ts
rename to aio/content/examples/styleguide/src/03-02/app/core/index.ts
diff --git a/aio/content/examples/style-guide/src/03-02/app/index.ts b/aio/content/examples/styleguide/src/03-02/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-02/app/index.ts
rename to aio/content/examples/styleguide/src/03-02/app/index.ts
diff --git a/aio/content/examples/style-guide/src/03-03/app/app.component.ts b/aio/content/examples/styleguide/src/03-03/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-03/app/app.component.ts
rename to aio/content/examples/styleguide/src/03-03/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/03-03/app/app.module.ts b/aio/content/examples/styleguide/src/03-03/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-03/app/app.module.ts
rename to aio/content/examples/styleguide/src/03-03/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/03-03/app/core/hero-collector.service.avoid.ts b/aio/content/examples/styleguide/src/03-03/app/core/hero-collector.service.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-03/app/core/hero-collector.service.avoid.ts
rename to aio/content/examples/styleguide/src/03-03/app/core/hero-collector.service.avoid.ts
diff --git a/aio/content/examples/style-guide/src/03-03/app/core/hero-collector.service.ts b/aio/content/examples/styleguide/src/03-03/app/core/hero-collector.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-03/app/core/hero-collector.service.ts
rename to aio/content/examples/styleguide/src/03-03/app/core/hero-collector.service.ts
diff --git a/aio/content/examples/style-guide/src/03-03/app/core/hero.model.avoid.ts b/aio/content/examples/styleguide/src/03-03/app/core/hero.model.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-03/app/core/hero.model.avoid.ts
rename to aio/content/examples/styleguide/src/03-03/app/core/hero.model.avoid.ts
diff --git a/aio/content/examples/style-guide/src/03-03/app/core/hero.model.ts b/aio/content/examples/styleguide/src/03-03/app/core/hero.model.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-03/app/core/hero.model.ts
rename to aio/content/examples/styleguide/src/03-03/app/core/hero.model.ts
diff --git a/aio/content/examples/style-guide/src/03-03/app/core/index.ts b/aio/content/examples/styleguide/src/03-03/app/core/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-03/app/core/index.ts
rename to aio/content/examples/styleguide/src/03-03/app/core/index.ts
diff --git a/aio/content/examples/style-guide/src/03-03/app/index.ts b/aio/content/examples/styleguide/src/03-03/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-03/app/index.ts
rename to aio/content/examples/styleguide/src/03-03/app/index.ts
diff --git a/aio/content/examples/style-guide/src/03-04/app/app.component.ts b/aio/content/examples/styleguide/src/03-04/app/app.component.ts
similarity index 90%
rename from aio/content/examples/style-guide/src/03-04/app/app.component.ts
rename to aio/content/examples/styleguide/src/03-04/app/app.component.ts
index 555c9e9441..5aaf3402e1 100644
--- a/aio/content/examples/style-guide/src/03-04/app/app.component.ts
+++ b/aio/content/examples/styleguide/src/03-04/app/app.component.ts
@@ -22,6 +22,6 @@ export class AppComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.toastService.activate('Hello style-guide!');
+    this.toastService.activate('Hello Style Guide!');
   }
 }
diff --git a/aio/content/examples/style-guide/src/03-04/app/app.module.ts b/aio/content/examples/styleguide/src/03-04/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-04/app/app.module.ts
rename to aio/content/examples/styleguide/src/03-04/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/03-04/app/core/index.ts b/aio/content/examples/styleguide/src/03-04/app/core/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-04/app/core/index.ts
rename to aio/content/examples/styleguide/src/03-04/app/core/index.ts
diff --git a/aio/content/examples/style-guide/src/03-04/app/core/toast.service.avoid.ts b/aio/content/examples/styleguide/src/03-04/app/core/toast.service.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-04/app/core/toast.service.avoid.ts
rename to aio/content/examples/styleguide/src/03-04/app/core/toast.service.avoid.ts
diff --git a/aio/content/examples/style-guide/src/03-04/app/core/toast.service.ts b/aio/content/examples/styleguide/src/03-04/app/core/toast.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-04/app/core/toast.service.ts
rename to aio/content/examples/styleguide/src/03-04/app/core/toast.service.ts
diff --git a/aio/content/examples/style-guide/src/03-04/app/index.ts b/aio/content/examples/styleguide/src/03-04/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-04/app/index.ts
rename to aio/content/examples/styleguide/src/03-04/app/index.ts
diff --git a/aio/content/examples/style-guide/src/03-06/app/app.component.html b/aio/content/examples/styleguide/src/03-06/app/app.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/app.component.html
rename to aio/content/examples/styleguide/src/03-06/app/app.component.html
diff --git a/aio/content/examples/style-guide/src/03-06/app/app.component.ts b/aio/content/examples/styleguide/src/03-06/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/app.component.ts
rename to aio/content/examples/styleguide/src/03-06/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/03-06/app/app.module.ts b/aio/content/examples/styleguide/src/03-06/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/app.module.ts
rename to aio/content/examples/styleguide/src/03-06/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/03-06/app/core/exception.service.ts b/aio/content/examples/styleguide/src/03-06/app/core/exception.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/core/exception.service.ts
rename to aio/content/examples/styleguide/src/03-06/app/core/exception.service.ts
diff --git a/aio/content/examples/style-guide/src/03-06/app/core/index.ts b/aio/content/examples/styleguide/src/03-06/app/core/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/core/index.ts
rename to aio/content/examples/styleguide/src/03-06/app/core/index.ts
diff --git a/aio/content/examples/style-guide/src/03-06/app/core/spinner/index.ts b/aio/content/examples/styleguide/src/03-06/app/core/spinner/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/core/spinner/index.ts
rename to aio/content/examples/styleguide/src/03-06/app/core/spinner/index.ts
diff --git a/aio/content/examples/style-guide/src/03-06/app/core/spinner/spinner.component.ts b/aio/content/examples/styleguide/src/03-06/app/core/spinner/spinner.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/core/spinner/spinner.component.ts
rename to aio/content/examples/styleguide/src/03-06/app/core/spinner/spinner.component.ts
diff --git a/aio/content/examples/style-guide/src/03-06/app/core/spinner/spinner.service.ts b/aio/content/examples/styleguide/src/03-06/app/core/spinner/spinner.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/core/spinner/spinner.service.ts
rename to aio/content/examples/styleguide/src/03-06/app/core/spinner/spinner.service.ts
diff --git a/aio/content/examples/style-guide/src/03-06/app/core/toast/index.ts b/aio/content/examples/styleguide/src/03-06/app/core/toast/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/core/toast/index.ts
rename to aio/content/examples/styleguide/src/03-06/app/core/toast/index.ts
diff --git a/aio/content/examples/style-guide/src/03-06/app/core/toast/toast.component.ts b/aio/content/examples/styleguide/src/03-06/app/core/toast/toast.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/core/toast/toast.component.ts
rename to aio/content/examples/styleguide/src/03-06/app/core/toast/toast.component.ts
diff --git a/aio/content/examples/style-guide/src/03-06/app/core/toast/toast.service.ts b/aio/content/examples/styleguide/src/03-06/app/core/toast/toast.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/core/toast/toast.service.ts
rename to aio/content/examples/styleguide/src/03-06/app/core/toast/toast.service.ts
diff --git a/aio/content/examples/style-guide/src/03-06/app/heroes/index.ts b/aio/content/examples/styleguide/src/03-06/app/heroes/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/heroes/index.ts
rename to aio/content/examples/styleguide/src/03-06/app/heroes/index.ts
diff --git a/aio/content/examples/style-guide/src/03-06/app/heroes/shared/hero.model.ts b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.model.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/heroes/shared/hero.model.ts
rename to aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.model.ts
diff --git a/aio/content/examples/style-guide/src/03-06/app/heroes/shared/hero.service.avoid.ts b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/heroes/shared/hero.service.avoid.ts
rename to aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts
diff --git a/aio/content/examples/style-guide/src/03-06/app/heroes/shared/hero.service.ts b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/heroes/shared/hero.service.ts
rename to aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts
diff --git a/aio/content/examples/style-guide/src/03-06/app/heroes/shared/index.ts b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/heroes/shared/index.ts
rename to aio/content/examples/styleguide/src/03-06/app/heroes/shared/index.ts
diff --git a/aio/content/examples/style-guide/src/03-06/app/index.ts b/aio/content/examples/styleguide/src/03-06/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/index.ts
rename to aio/content/examples/styleguide/src/03-06/app/index.ts
diff --git a/aio/content/examples/style-guide/src/03-06/app/shared/toast/toast.component.ts b/aio/content/examples/styleguide/src/03-06/app/shared/toast/toast.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/03-06/app/shared/toast/toast.component.ts
rename to aio/content/examples/styleguide/src/03-06/app/shared/toast/toast.component.ts
diff --git a/aio/content/examples/style-guide/src/04-08/app/app.component.ts b/aio/content/examples/styleguide/src/04-08/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-08/app/app.component.ts
rename to aio/content/examples/styleguide/src/04-08/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/04-08/app/app.module.ts b/aio/content/examples/styleguide/src/04-08/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-08/app/app.module.ts
rename to aio/content/examples/styleguide/src/04-08/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/04-08/app/heroes/heroes.component.html b/aio/content/examples/styleguide/src/04-08/app/heroes/heroes.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/04-08/app/heroes/heroes.component.html
rename to aio/content/examples/styleguide/src/04-08/app/heroes/heroes.component.html
diff --git a/aio/content/examples/style-guide/src/04-08/app/heroes/heroes.component.ts b/aio/content/examples/styleguide/src/04-08/app/heroes/heroes.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-08/app/heroes/heroes.component.ts
rename to aio/content/examples/styleguide/src/04-08/app/heroes/heroes.component.ts
diff --git a/aio/content/examples/style-guide/src/04-10/app/app.component.ts b/aio/content/examples/styleguide/src/04-10/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-10/app/app.component.ts
rename to aio/content/examples/styleguide/src/04-10/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/04-10/app/app.module.ts b/aio/content/examples/styleguide/src/04-10/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-10/app/app.module.ts
rename to aio/content/examples/styleguide/src/04-10/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/04-10/app/heroes/heroes.component.html b/aio/content/examples/styleguide/src/04-10/app/heroes/heroes.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/04-10/app/heroes/heroes.component.html
rename to aio/content/examples/styleguide/src/04-10/app/heroes/heroes.component.html
diff --git a/aio/content/examples/style-guide/src/04-10/app/heroes/heroes.component.ts b/aio/content/examples/styleguide/src/04-10/app/heroes/heroes.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-10/app/heroes/heroes.component.ts
rename to aio/content/examples/styleguide/src/04-10/app/heroes/heroes.component.ts
diff --git a/aio/content/examples/style-guide/src/04-10/app/shared/filter-text/filter-text.component.ts b/aio/content/examples/styleguide/src/04-10/app/shared/filter-text/filter-text.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-10/app/shared/filter-text/filter-text.component.ts
rename to aio/content/examples/styleguide/src/04-10/app/shared/filter-text/filter-text.component.ts
diff --git a/aio/content/examples/style-guide/src/04-10/app/shared/filter-text/filter-text.service.ts b/aio/content/examples/styleguide/src/04-10/app/shared/filter-text/filter-text.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-10/app/shared/filter-text/filter-text.service.ts
rename to aio/content/examples/styleguide/src/04-10/app/shared/filter-text/filter-text.service.ts
diff --git a/aio/content/examples/style-guide/src/04-10/app/shared/init-caps.pipe.ts b/aio/content/examples/styleguide/src/04-10/app/shared/init-caps.pipe.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-10/app/shared/init-caps.pipe.ts
rename to aio/content/examples/styleguide/src/04-10/app/shared/init-caps.pipe.ts
diff --git a/aio/content/examples/style-guide/src/04-10/app/shared/shared.module.ts b/aio/content/examples/styleguide/src/04-10/app/shared/shared.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-10/app/shared/shared.module.ts
rename to aio/content/examples/styleguide/src/04-10/app/shared/shared.module.ts
diff --git a/aio/content/examples/style-guide/src/04-11/app/app.component.ts b/aio/content/examples/styleguide/src/04-11/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-11/app/app.component.ts
rename to aio/content/examples/styleguide/src/04-11/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/04-11/app/app.module.ts b/aio/content/examples/styleguide/src/04-11/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-11/app/app.module.ts
rename to aio/content/examples/styleguide/src/04-11/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/04-11/app/core/core.module.ts b/aio/content/examples/styleguide/src/04-11/app/core/core.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-11/app/core/core.module.ts
rename to aio/content/examples/styleguide/src/04-11/app/core/core.module.ts
diff --git a/aio/content/examples/style-guide/src/04-11/app/core/index.ts b/aio/content/examples/styleguide/src/04-11/app/core/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-11/app/core/index.ts
rename to aio/content/examples/styleguide/src/04-11/app/core/index.ts
diff --git a/aio/content/examples/style-guide/src/04-11/app/core/logger.service.ts b/aio/content/examples/styleguide/src/04-11/app/core/logger.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-11/app/core/logger.service.ts
rename to aio/content/examples/styleguide/src/04-11/app/core/logger.service.ts
diff --git a/aio/content/examples/style-guide/src/04-11/app/core/nav/nav.component.css b/aio/content/examples/styleguide/src/04-11/app/core/nav/nav.component.css
similarity index 100%
rename from aio/content/examples/style-guide/src/04-11/app/core/nav/nav.component.css
rename to aio/content/examples/styleguide/src/04-11/app/core/nav/nav.component.css
diff --git a/aio/content/examples/style-guide/src/04-11/app/core/nav/nav.component.html b/aio/content/examples/styleguide/src/04-11/app/core/nav/nav.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/04-11/app/core/nav/nav.component.html
rename to aio/content/examples/styleguide/src/04-11/app/core/nav/nav.component.html
diff --git a/aio/content/examples/style-guide/src/04-11/app/core/nav/nav.component.ts b/aio/content/examples/styleguide/src/04-11/app/core/nav/nav.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-11/app/core/nav/nav.component.ts
rename to aio/content/examples/styleguide/src/04-11/app/core/nav/nav.component.ts
diff --git a/aio/content/examples/style-guide/src/04-11/app/core/spinner/spinner.component.css b/aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.component.css
similarity index 100%
rename from aio/content/examples/style-guide/src/04-11/app/core/spinner/spinner.component.css
rename to aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.component.css
diff --git a/aio/content/examples/style-guide/src/04-11/app/core/spinner/spinner.component.html b/aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/04-11/app/core/spinner/spinner.component.html
rename to aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.component.html
diff --git a/aio/content/examples/style-guide/src/04-11/app/core/spinner/spinner.component.ts b/aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-11/app/core/spinner/spinner.component.ts
rename to aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.component.ts
diff --git a/aio/content/examples/style-guide/src/04-11/app/core/spinner/spinner.service.ts b/aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-11/app/core/spinner/spinner.service.ts
rename to aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.service.ts
diff --git a/aio/content/examples/style-guide/src/04-11/app/heroes/heroes.component.html b/aio/content/examples/styleguide/src/04-11/app/heroes/heroes.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/04-11/app/heroes/heroes.component.html
rename to aio/content/examples/styleguide/src/04-11/app/heroes/heroes.component.html
diff --git a/aio/content/examples/style-guide/src/04-11/app/heroes/heroes.component.ts b/aio/content/examples/styleguide/src/04-11/app/heroes/heroes.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-11/app/heroes/heroes.component.ts
rename to aio/content/examples/styleguide/src/04-11/app/heroes/heroes.component.ts
diff --git a/aio/content/examples/style-guide/src/04-12/app/app.component.ts b/aio/content/examples/styleguide/src/04-12/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-12/app/app.component.ts
rename to aio/content/examples/styleguide/src/04-12/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/04-12/app/app.module.ts b/aio/content/examples/styleguide/src/04-12/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-12/app/app.module.ts
rename to aio/content/examples/styleguide/src/04-12/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/04-12/app/core/core.module.ts b/aio/content/examples/styleguide/src/04-12/app/core/core.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-12/app/core/core.module.ts
rename to aio/content/examples/styleguide/src/04-12/app/core/core.module.ts
diff --git a/aio/content/examples/style-guide/src/04-12/app/core/index.ts b/aio/content/examples/styleguide/src/04-12/app/core/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-12/app/core/index.ts
rename to aio/content/examples/styleguide/src/04-12/app/core/index.ts
diff --git a/aio/content/examples/style-guide/src/04-12/app/core/logger.service.ts b/aio/content/examples/styleguide/src/04-12/app/core/logger.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-12/app/core/logger.service.ts
rename to aio/content/examples/styleguide/src/04-12/app/core/logger.service.ts
diff --git a/aio/content/examples/style-guide/src/04-12/app/core/module-import-guard.ts b/aio/content/examples/styleguide/src/04-12/app/core/module-import-guard.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-12/app/core/module-import-guard.ts
rename to aio/content/examples/styleguide/src/04-12/app/core/module-import-guard.ts
diff --git a/aio/content/examples/style-guide/src/04-12/app/core/nav/nav.component.css b/aio/content/examples/styleguide/src/04-12/app/core/nav/nav.component.css
similarity index 100%
rename from aio/content/examples/style-guide/src/04-12/app/core/nav/nav.component.css
rename to aio/content/examples/styleguide/src/04-12/app/core/nav/nav.component.css
diff --git a/aio/content/examples/style-guide/src/04-12/app/core/nav/nav.component.html b/aio/content/examples/styleguide/src/04-12/app/core/nav/nav.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/04-12/app/core/nav/nav.component.html
rename to aio/content/examples/styleguide/src/04-12/app/core/nav/nav.component.html
diff --git a/aio/content/examples/style-guide/src/04-12/app/core/nav/nav.component.ts b/aio/content/examples/styleguide/src/04-12/app/core/nav/nav.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-12/app/core/nav/nav.component.ts
rename to aio/content/examples/styleguide/src/04-12/app/core/nav/nav.component.ts
diff --git a/aio/content/examples/style-guide/src/04-12/app/heroes/heroes.component.html b/aio/content/examples/styleguide/src/04-12/app/heroes/heroes.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/04-12/app/heroes/heroes.component.html
rename to aio/content/examples/styleguide/src/04-12/app/heroes/heroes.component.html
diff --git a/aio/content/examples/style-guide/src/04-12/app/heroes/heroes.component.ts b/aio/content/examples/styleguide/src/04-12/app/heroes/heroes.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/04-12/app/heroes/heroes.component.ts
rename to aio/content/examples/styleguide/src/04-12/app/heroes/heroes.component.ts
diff --git a/aio/content/examples/style-guide/src/05-02/app/app.component.html b/aio/content/examples/styleguide/src/05-02/app/app.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/05-02/app/app.component.html
rename to aio/content/examples/styleguide/src/05-02/app/app.component.html
diff --git a/aio/content/examples/style-guide/src/05-02/app/app.component.ts b/aio/content/examples/styleguide/src/05-02/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-02/app/app.component.ts
rename to aio/content/examples/styleguide/src/05-02/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/05-02/app/app.module.ts b/aio/content/examples/styleguide/src/05-02/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-02/app/app.module.ts
rename to aio/content/examples/styleguide/src/05-02/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/05-02/app/heroes/index.ts b/aio/content/examples/styleguide/src/05-02/app/heroes/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-02/app/heroes/index.ts
rename to aio/content/examples/styleguide/src/05-02/app/heroes/index.ts
diff --git a/aio/content/examples/style-guide/src/05-02/app/heroes/shared/hero-button/hero-button.component.avoid.ts b/aio/content/examples/styleguide/src/05-02/app/heroes/shared/hero-button/hero-button.component.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-02/app/heroes/shared/hero-button/hero-button.component.avoid.ts
rename to aio/content/examples/styleguide/src/05-02/app/heroes/shared/hero-button/hero-button.component.avoid.ts
diff --git a/aio/content/examples/style-guide/src/05-02/app/heroes/shared/hero-button/hero-button.component.html b/aio/content/examples/styleguide/src/05-02/app/heroes/shared/hero-button/hero-button.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/05-02/app/heroes/shared/hero-button/hero-button.component.html
rename to aio/content/examples/styleguide/src/05-02/app/heroes/shared/hero-button/hero-button.component.html
diff --git a/aio/content/examples/style-guide/src/05-02/app/heroes/shared/hero-button/hero-button.component.ts b/aio/content/examples/styleguide/src/05-02/app/heroes/shared/hero-button/hero-button.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-02/app/heroes/shared/hero-button/hero-button.component.ts
rename to aio/content/examples/styleguide/src/05-02/app/heroes/shared/hero-button/hero-button.component.ts
diff --git a/aio/content/examples/style-guide/src/05-02/app/heroes/shared/hero-button/index.ts b/aio/content/examples/styleguide/src/05-02/app/heroes/shared/hero-button/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-02/app/heroes/shared/hero-button/index.ts
rename to aio/content/examples/styleguide/src/05-02/app/heroes/shared/hero-button/index.ts
diff --git a/aio/content/examples/style-guide/src/05-02/app/heroes/shared/index.ts b/aio/content/examples/styleguide/src/05-02/app/heroes/shared/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-02/app/heroes/shared/index.ts
rename to aio/content/examples/styleguide/src/05-02/app/heroes/shared/index.ts
diff --git a/aio/content/examples/style-guide/src/05-02/app/index.ts b/aio/content/examples/styleguide/src/05-02/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-02/app/index.ts
rename to aio/content/examples/styleguide/src/05-02/app/index.ts
diff --git a/aio/content/examples/style-guide/src/05-03/app/app.component.avoid.html b/aio/content/examples/styleguide/src/05-03/app/app.component.avoid.html
similarity index 100%
rename from aio/content/examples/style-guide/src/05-03/app/app.component.avoid.html
rename to aio/content/examples/styleguide/src/05-03/app/app.component.avoid.html
diff --git a/aio/content/examples/style-guide/src/05-03/app/app.component.html b/aio/content/examples/styleguide/src/05-03/app/app.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/05-03/app/app.component.html
rename to aio/content/examples/styleguide/src/05-03/app/app.component.html
diff --git a/aio/content/examples/style-guide/src/05-03/app/app.component.ts b/aio/content/examples/styleguide/src/05-03/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-03/app/app.component.ts
rename to aio/content/examples/styleguide/src/05-03/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/05-03/app/app.module.ts b/aio/content/examples/styleguide/src/05-03/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-03/app/app.module.ts
rename to aio/content/examples/styleguide/src/05-03/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/05-03/app/heroes/index.ts b/aio/content/examples/styleguide/src/05-03/app/heroes/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-03/app/heroes/index.ts
rename to aio/content/examples/styleguide/src/05-03/app/heroes/index.ts
diff --git a/aio/content/examples/style-guide/src/05-03/app/heroes/shared/hero-button/hero-button.component.avoid.ts b/aio/content/examples/styleguide/src/05-03/app/heroes/shared/hero-button/hero-button.component.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-03/app/heroes/shared/hero-button/hero-button.component.avoid.ts
rename to aio/content/examples/styleguide/src/05-03/app/heroes/shared/hero-button/hero-button.component.avoid.ts
diff --git a/aio/content/examples/style-guide/src/05-03/app/heroes/shared/hero-button/hero-button.component.html b/aio/content/examples/styleguide/src/05-03/app/heroes/shared/hero-button/hero-button.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/05-03/app/heroes/shared/hero-button/hero-button.component.html
rename to aio/content/examples/styleguide/src/05-03/app/heroes/shared/hero-button/hero-button.component.html
diff --git a/aio/content/examples/style-guide/src/05-03/app/heroes/shared/hero-button/hero-button.component.ts b/aio/content/examples/styleguide/src/05-03/app/heroes/shared/hero-button/hero-button.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-03/app/heroes/shared/hero-button/hero-button.component.ts
rename to aio/content/examples/styleguide/src/05-03/app/heroes/shared/hero-button/hero-button.component.ts
diff --git a/aio/content/examples/style-guide/src/05-03/app/heroes/shared/hero-button/index.ts b/aio/content/examples/styleguide/src/05-03/app/heroes/shared/hero-button/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-03/app/heroes/shared/hero-button/index.ts
rename to aio/content/examples/styleguide/src/05-03/app/heroes/shared/hero-button/index.ts
diff --git a/aio/content/examples/style-guide/src/05-03/app/heroes/shared/index.ts b/aio/content/examples/styleguide/src/05-03/app/heroes/shared/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-03/app/heroes/shared/index.ts
rename to aio/content/examples/styleguide/src/05-03/app/heroes/shared/index.ts
diff --git a/aio/content/examples/style-guide/src/05-03/app/index.ts b/aio/content/examples/styleguide/src/05-03/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-03/app/index.ts
rename to aio/content/examples/styleguide/src/05-03/app/index.ts
diff --git a/aio/content/examples/style-guide/src/05-04/app/app.component.ts b/aio/content/examples/styleguide/src/05-04/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-04/app/app.component.ts
rename to aio/content/examples/styleguide/src/05-04/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/05-04/app/app.module.ts b/aio/content/examples/styleguide/src/05-04/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-04/app/app.module.ts
rename to aio/content/examples/styleguide/src/05-04/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/05-04/app/heroes/heroes.component.avoid.ts b/aio/content/examples/styleguide/src/05-04/app/heroes/heroes.component.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-04/app/heroes/heroes.component.avoid.ts
rename to aio/content/examples/styleguide/src/05-04/app/heroes/heroes.component.avoid.ts
diff --git a/aio/content/examples/style-guide/src/05-04/app/heroes/heroes.component.css b/aio/content/examples/styleguide/src/05-04/app/heroes/heroes.component.css
similarity index 100%
rename from aio/content/examples/style-guide/src/05-04/app/heroes/heroes.component.css
rename to aio/content/examples/styleguide/src/05-04/app/heroes/heroes.component.css
diff --git a/aio/content/examples/style-guide/src/05-04/app/heroes/heroes.component.html b/aio/content/examples/styleguide/src/05-04/app/heroes/heroes.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/05-04/app/heroes/heroes.component.html
rename to aio/content/examples/styleguide/src/05-04/app/heroes/heroes.component.html
diff --git a/aio/content/examples/style-guide/src/05-04/app/heroes/heroes.component.ts b/aio/content/examples/styleguide/src/05-04/app/heroes/heroes.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-04/app/heroes/heroes.component.ts
rename to aio/content/examples/styleguide/src/05-04/app/heroes/heroes.component.ts
diff --git a/aio/content/examples/style-guide/src/05-04/app/heroes/index.ts b/aio/content/examples/styleguide/src/05-04/app/heroes/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-04/app/heroes/index.ts
rename to aio/content/examples/styleguide/src/05-04/app/heroes/index.ts
diff --git a/aio/content/examples/style-guide/src/05-04/app/heroes/shared/hero.model.ts b/aio/content/examples/styleguide/src/05-04/app/heroes/shared/hero.model.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-04/app/heroes/shared/hero.model.ts
rename to aio/content/examples/styleguide/src/05-04/app/heroes/shared/hero.model.ts
diff --git a/aio/content/examples/style-guide/src/05-04/app/heroes/shared/hero.service.ts b/aio/content/examples/styleguide/src/05-04/app/heroes/shared/hero.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-04/app/heroes/shared/hero.service.ts
rename to aio/content/examples/styleguide/src/05-04/app/heroes/shared/hero.service.ts
diff --git a/aio/content/examples/style-guide/src/05-04/app/heroes/shared/index.ts b/aio/content/examples/styleguide/src/05-04/app/heroes/shared/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-04/app/heroes/shared/index.ts
rename to aio/content/examples/styleguide/src/05-04/app/heroes/shared/index.ts
diff --git a/aio/content/examples/style-guide/src/05-04/app/index.ts b/aio/content/examples/styleguide/src/05-04/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-04/app/index.ts
rename to aio/content/examples/styleguide/src/05-04/app/index.ts
diff --git a/aio/content/examples/style-guide/src/05-12/app/app.component.ts b/aio/content/examples/styleguide/src/05-12/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-12/app/app.component.ts
rename to aio/content/examples/styleguide/src/05-12/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/05-12/app/app.module.ts b/aio/content/examples/styleguide/src/05-12/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-12/app/app.module.ts
rename to aio/content/examples/styleguide/src/05-12/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/05-12/app/heroes/index.ts b/aio/content/examples/styleguide/src/05-12/app/heroes/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-12/app/heroes/index.ts
rename to aio/content/examples/styleguide/src/05-12/app/heroes/index.ts
diff --git a/aio/content/examples/style-guide/src/05-12/app/heroes/shared/hero-button/hero-button.component.avoid.ts b/aio/content/examples/styleguide/src/05-12/app/heroes/shared/hero-button/hero-button.component.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-12/app/heroes/shared/hero-button/hero-button.component.avoid.ts
rename to aio/content/examples/styleguide/src/05-12/app/heroes/shared/hero-button/hero-button.component.avoid.ts
diff --git a/aio/content/examples/style-guide/src/05-12/app/heroes/shared/hero-button/hero-button.component.ts b/aio/content/examples/styleguide/src/05-12/app/heroes/shared/hero-button/hero-button.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-12/app/heroes/shared/hero-button/hero-button.component.ts
rename to aio/content/examples/styleguide/src/05-12/app/heroes/shared/hero-button/hero-button.component.ts
diff --git a/aio/content/examples/style-guide/src/05-12/app/heroes/shared/hero-button/index.ts b/aio/content/examples/styleguide/src/05-12/app/heroes/shared/hero-button/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-12/app/heroes/shared/hero-button/index.ts
rename to aio/content/examples/styleguide/src/05-12/app/heroes/shared/hero-button/index.ts
diff --git a/aio/content/examples/style-guide/src/05-12/app/heroes/shared/index.ts b/aio/content/examples/styleguide/src/05-12/app/heroes/shared/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-12/app/heroes/shared/index.ts
rename to aio/content/examples/styleguide/src/05-12/app/heroes/shared/index.ts
diff --git a/aio/content/examples/style-guide/src/05-12/app/index.ts b/aio/content/examples/styleguide/src/05-12/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-12/app/index.ts
rename to aio/content/examples/styleguide/src/05-12/app/index.ts
diff --git a/aio/content/examples/style-guide/src/05-13/app/app.component.avoid.html b/aio/content/examples/styleguide/src/05-13/app/app.component.avoid.html
similarity index 100%
rename from aio/content/examples/style-guide/src/05-13/app/app.component.avoid.html
rename to aio/content/examples/styleguide/src/05-13/app/app.component.avoid.html
diff --git a/aio/content/examples/style-guide/src/05-13/app/app.component.html b/aio/content/examples/styleguide/src/05-13/app/app.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/05-13/app/app.component.html
rename to aio/content/examples/styleguide/src/05-13/app/app.component.html
diff --git a/aio/content/examples/style-guide/src/05-13/app/app.component.ts b/aio/content/examples/styleguide/src/05-13/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-13/app/app.component.ts
rename to aio/content/examples/styleguide/src/05-13/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/05-13/app/app.module.ts b/aio/content/examples/styleguide/src/05-13/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-13/app/app.module.ts
rename to aio/content/examples/styleguide/src/05-13/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/05-13/app/heroes/index.ts b/aio/content/examples/styleguide/src/05-13/app/heroes/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-13/app/heroes/index.ts
rename to aio/content/examples/styleguide/src/05-13/app/heroes/index.ts
diff --git a/aio/content/examples/style-guide/src/05-13/app/heroes/shared/hero-button/hero-button.component.avoid.ts b/aio/content/examples/styleguide/src/05-13/app/heroes/shared/hero-button/hero-button.component.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-13/app/heroes/shared/hero-button/hero-button.component.avoid.ts
rename to aio/content/examples/styleguide/src/05-13/app/heroes/shared/hero-button/hero-button.component.avoid.ts
diff --git a/aio/content/examples/style-guide/src/05-13/app/heroes/shared/hero-button/hero-button.component.ts b/aio/content/examples/styleguide/src/05-13/app/heroes/shared/hero-button/hero-button.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-13/app/heroes/shared/hero-button/hero-button.component.ts
rename to aio/content/examples/styleguide/src/05-13/app/heroes/shared/hero-button/hero-button.component.ts
diff --git a/aio/content/examples/style-guide/src/05-13/app/heroes/shared/hero-button/index.ts b/aio/content/examples/styleguide/src/05-13/app/heroes/shared/hero-button/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-13/app/heroes/shared/hero-button/index.ts
rename to aio/content/examples/styleguide/src/05-13/app/heroes/shared/hero-button/index.ts
diff --git a/aio/content/examples/style-guide/src/05-13/app/heroes/shared/hero-highlight.directive.ts b/aio/content/examples/styleguide/src/05-13/app/heroes/shared/hero-highlight.directive.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-13/app/heroes/shared/hero-highlight.directive.ts
rename to aio/content/examples/styleguide/src/05-13/app/heroes/shared/hero-highlight.directive.ts
diff --git a/aio/content/examples/style-guide/src/05-13/app/heroes/shared/index.ts b/aio/content/examples/styleguide/src/05-13/app/heroes/shared/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-13/app/heroes/shared/index.ts
rename to aio/content/examples/styleguide/src/05-13/app/heroes/shared/index.ts
diff --git a/aio/content/examples/style-guide/src/05-13/app/index.ts b/aio/content/examples/styleguide/src/05-13/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-13/app/index.ts
rename to aio/content/examples/styleguide/src/05-13/app/index.ts
diff --git a/aio/content/examples/style-guide/src/05-14/app/app.component.ts b/aio/content/examples/styleguide/src/05-14/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-14/app/app.component.ts
rename to aio/content/examples/styleguide/src/05-14/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/05-14/app/app.module.ts b/aio/content/examples/styleguide/src/05-14/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-14/app/app.module.ts
rename to aio/content/examples/styleguide/src/05-14/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/05-14/app/index.ts b/aio/content/examples/styleguide/src/05-14/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-14/app/index.ts
rename to aio/content/examples/styleguide/src/05-14/app/index.ts
diff --git a/aio/content/examples/style-guide/src/05-14/app/shared/index.ts b/aio/content/examples/styleguide/src/05-14/app/shared/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-14/app/shared/index.ts
rename to aio/content/examples/styleguide/src/05-14/app/shared/index.ts
diff --git a/aio/content/examples/style-guide/src/05-14/app/shared/toast/index.ts b/aio/content/examples/styleguide/src/05-14/app/shared/toast/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-14/app/shared/toast/index.ts
rename to aio/content/examples/styleguide/src/05-14/app/shared/toast/index.ts
diff --git a/aio/content/examples/style-guide/src/05-14/app/shared/toast/toast.component.avoid.ts b/aio/content/examples/styleguide/src/05-14/app/shared/toast/toast.component.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-14/app/shared/toast/toast.component.avoid.ts
rename to aio/content/examples/styleguide/src/05-14/app/shared/toast/toast.component.avoid.ts
diff --git a/aio/content/examples/style-guide/src/05-14/app/shared/toast/toast.component.ts b/aio/content/examples/styleguide/src/05-14/app/shared/toast/toast.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-14/app/shared/toast/toast.component.ts
rename to aio/content/examples/styleguide/src/05-14/app/shared/toast/toast.component.ts
diff --git a/aio/content/examples/style-guide/src/05-15/app/app.component.ts b/aio/content/examples/styleguide/src/05-15/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-15/app/app.component.ts
rename to aio/content/examples/styleguide/src/05-15/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/05-15/app/app.module.ts b/aio/content/examples/styleguide/src/05-15/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-15/app/app.module.ts
rename to aio/content/examples/styleguide/src/05-15/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/05-15/app/heroes/hero-list/hero-list.component.avoid.ts b/aio/content/examples/styleguide/src/05-15/app/heroes/hero-list/hero-list.component.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-15/app/heroes/hero-list/hero-list.component.avoid.ts
rename to aio/content/examples/styleguide/src/05-15/app/heroes/hero-list/hero-list.component.avoid.ts
diff --git a/aio/content/examples/style-guide/src/05-15/app/heroes/hero-list/hero-list.component.ts b/aio/content/examples/styleguide/src/05-15/app/heroes/hero-list/hero-list.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-15/app/heroes/hero-list/hero-list.component.ts
rename to aio/content/examples/styleguide/src/05-15/app/heroes/hero-list/hero-list.component.ts
diff --git a/aio/content/examples/style-guide/src/05-15/app/heroes/hero-list/index.ts b/aio/content/examples/styleguide/src/05-15/app/heroes/hero-list/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-15/app/heroes/hero-list/index.ts
rename to aio/content/examples/styleguide/src/05-15/app/heroes/hero-list/index.ts
diff --git a/aio/content/examples/style-guide/src/05-15/app/heroes/index.ts b/aio/content/examples/styleguide/src/05-15/app/heroes/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-15/app/heroes/index.ts
rename to aio/content/examples/styleguide/src/05-15/app/heroes/index.ts
diff --git a/aio/content/examples/style-guide/src/05-15/app/heroes/shared/hero.model.ts b/aio/content/examples/styleguide/src/05-15/app/heroes/shared/hero.model.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-15/app/heroes/shared/hero.model.ts
rename to aio/content/examples/styleguide/src/05-15/app/heroes/shared/hero.model.ts
diff --git a/aio/content/examples/style-guide/src/05-15/app/heroes/shared/hero.service.ts b/aio/content/examples/styleguide/src/05-15/app/heroes/shared/hero.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-15/app/heroes/shared/hero.service.ts
rename to aio/content/examples/styleguide/src/05-15/app/heroes/shared/hero.service.ts
diff --git a/aio/content/examples/style-guide/src/05-15/app/heroes/shared/index.ts b/aio/content/examples/styleguide/src/05-15/app/heroes/shared/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-15/app/heroes/shared/index.ts
rename to aio/content/examples/styleguide/src/05-15/app/heroes/shared/index.ts
diff --git a/aio/content/examples/style-guide/src/05-15/app/index.ts b/aio/content/examples/styleguide/src/05-15/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-15/app/index.ts
rename to aio/content/examples/styleguide/src/05-15/app/index.ts
diff --git a/aio/content/examples/style-guide/src/05-16/app/app.component.avoid.html b/aio/content/examples/styleguide/src/05-16/app/app.component.avoid.html
similarity index 100%
rename from aio/content/examples/style-guide/src/05-16/app/app.component.avoid.html
rename to aio/content/examples/styleguide/src/05-16/app/app.component.avoid.html
diff --git a/aio/content/examples/style-guide/src/05-16/app/app.component.html b/aio/content/examples/styleguide/src/05-16/app/app.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/05-16/app/app.component.html
rename to aio/content/examples/styleguide/src/05-16/app/app.component.html
diff --git a/aio/content/examples/style-guide/src/05-16/app/app.component.ts b/aio/content/examples/styleguide/src/05-16/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-16/app/app.component.ts
rename to aio/content/examples/styleguide/src/05-16/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/05-16/app/app.module.ts b/aio/content/examples/styleguide/src/05-16/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-16/app/app.module.ts
rename to aio/content/examples/styleguide/src/05-16/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/05-16/app/heroes/hero.component.avoid.ts b/aio/content/examples/styleguide/src/05-16/app/heroes/hero.component.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-16/app/heroes/hero.component.avoid.ts
rename to aio/content/examples/styleguide/src/05-16/app/heroes/hero.component.avoid.ts
diff --git a/aio/content/examples/style-guide/src/05-16/app/heroes/hero.component.ts b/aio/content/examples/styleguide/src/05-16/app/heroes/hero.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-16/app/heroes/hero.component.ts
rename to aio/content/examples/styleguide/src/05-16/app/heroes/hero.component.ts
diff --git a/aio/content/examples/style-guide/src/05-16/app/heroes/index.ts b/aio/content/examples/styleguide/src/05-16/app/heroes/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-16/app/heroes/index.ts
rename to aio/content/examples/styleguide/src/05-16/app/heroes/index.ts
diff --git a/aio/content/examples/style-guide/src/05-16/app/index.ts b/aio/content/examples/styleguide/src/05-16/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-16/app/index.ts
rename to aio/content/examples/styleguide/src/05-16/app/index.ts
diff --git a/aio/content/examples/style-guide/src/05-17/app/app.component.ts b/aio/content/examples/styleguide/src/05-17/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-17/app/app.component.ts
rename to aio/content/examples/styleguide/src/05-17/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/05-17/app/app.module.ts b/aio/content/examples/styleguide/src/05-17/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-17/app/app.module.ts
rename to aio/content/examples/styleguide/src/05-17/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/05-17/app/heroes/hero-list/hero-list.component.avoid.ts b/aio/content/examples/styleguide/src/05-17/app/heroes/hero-list/hero-list.component.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-17/app/heroes/hero-list/hero-list.component.avoid.ts
rename to aio/content/examples/styleguide/src/05-17/app/heroes/hero-list/hero-list.component.avoid.ts
diff --git a/aio/content/examples/style-guide/src/05-17/app/heroes/hero-list/hero-list.component.ts b/aio/content/examples/styleguide/src/05-17/app/heroes/hero-list/hero-list.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-17/app/heroes/hero-list/hero-list.component.ts
rename to aio/content/examples/styleguide/src/05-17/app/heroes/hero-list/hero-list.component.ts
diff --git a/aio/content/examples/style-guide/src/05-17/app/heroes/hero-list/index.ts b/aio/content/examples/styleguide/src/05-17/app/heroes/hero-list/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-17/app/heroes/hero-list/index.ts
rename to aio/content/examples/styleguide/src/05-17/app/heroes/hero-list/index.ts
diff --git a/aio/content/examples/style-guide/src/05-17/app/heroes/hero/hero.component.ts b/aio/content/examples/styleguide/src/05-17/app/heroes/hero/hero.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-17/app/heroes/hero/hero.component.ts
rename to aio/content/examples/styleguide/src/05-17/app/heroes/hero/hero.component.ts
diff --git a/aio/content/examples/style-guide/src/05-17/app/heroes/hero/index.ts b/aio/content/examples/styleguide/src/05-17/app/heroes/hero/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-17/app/heroes/hero/index.ts
rename to aio/content/examples/styleguide/src/05-17/app/heroes/hero/index.ts
diff --git a/aio/content/examples/style-guide/src/05-17/app/heroes/index.ts b/aio/content/examples/styleguide/src/05-17/app/heroes/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-17/app/heroes/index.ts
rename to aio/content/examples/styleguide/src/05-17/app/heroes/index.ts
diff --git a/aio/content/examples/style-guide/src/05-17/app/heroes/shared/hero.model.ts b/aio/content/examples/styleguide/src/05-17/app/heroes/shared/hero.model.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-17/app/heroes/shared/hero.model.ts
rename to aio/content/examples/styleguide/src/05-17/app/heroes/shared/hero.model.ts
diff --git a/aio/content/examples/style-guide/src/05-17/app/heroes/shared/index.ts b/aio/content/examples/styleguide/src/05-17/app/heroes/shared/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-17/app/heroes/shared/index.ts
rename to aio/content/examples/styleguide/src/05-17/app/heroes/shared/index.ts
diff --git a/aio/content/examples/style-guide/src/05-17/app/index.ts b/aio/content/examples/styleguide/src/05-17/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/05-17/app/index.ts
rename to aio/content/examples/styleguide/src/05-17/app/index.ts
diff --git a/aio/content/examples/style-guide/src/06-01/app/app.component.html b/aio/content/examples/styleguide/src/06-01/app/app.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/06-01/app/app.component.html
rename to aio/content/examples/styleguide/src/06-01/app/app.component.html
diff --git a/aio/content/examples/style-guide/src/06-01/app/app.component.ts b/aio/content/examples/styleguide/src/06-01/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/06-01/app/app.component.ts
rename to aio/content/examples/styleguide/src/06-01/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/06-01/app/app.module.ts b/aio/content/examples/styleguide/src/06-01/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/06-01/app/app.module.ts
rename to aio/content/examples/styleguide/src/06-01/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/06-01/app/index.ts b/aio/content/examples/styleguide/src/06-01/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/06-01/app/index.ts
rename to aio/content/examples/styleguide/src/06-01/app/index.ts
diff --git a/aio/content/examples/style-guide/src/06-01/app/shared/highlight.directive.ts b/aio/content/examples/styleguide/src/06-01/app/shared/highlight.directive.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/06-01/app/shared/highlight.directive.ts
rename to aio/content/examples/styleguide/src/06-01/app/shared/highlight.directive.ts
diff --git a/aio/content/examples/style-guide/src/06-01/app/shared/index.ts b/aio/content/examples/styleguide/src/06-01/app/shared/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/06-01/app/shared/index.ts
rename to aio/content/examples/styleguide/src/06-01/app/shared/index.ts
diff --git a/aio/content/examples/style-guide/src/06-03/app/app.component.ts b/aio/content/examples/styleguide/src/06-03/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/06-03/app/app.component.ts
rename to aio/content/examples/styleguide/src/06-03/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/06-03/app/app.module.ts b/aio/content/examples/styleguide/src/06-03/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/06-03/app/app.module.ts
rename to aio/content/examples/styleguide/src/06-03/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/06-03/app/index.ts b/aio/content/examples/styleguide/src/06-03/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/06-03/app/index.ts
rename to aio/content/examples/styleguide/src/06-03/app/index.ts
diff --git a/aio/content/examples/style-guide/src/06-03/app/shared/index.ts b/aio/content/examples/styleguide/src/06-03/app/shared/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/06-03/app/shared/index.ts
rename to aio/content/examples/styleguide/src/06-03/app/shared/index.ts
diff --git a/aio/content/examples/style-guide/src/06-03/app/shared/validator.directive.ts b/aio/content/examples/styleguide/src/06-03/app/shared/validator.directive.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/06-03/app/shared/validator.directive.ts
rename to aio/content/examples/styleguide/src/06-03/app/shared/validator.directive.ts
diff --git a/aio/content/examples/style-guide/src/06-03/app/shared/validator2.directive.ts b/aio/content/examples/styleguide/src/06-03/app/shared/validator2.directive.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/06-03/app/shared/validator2.directive.ts
rename to aio/content/examples/styleguide/src/06-03/app/shared/validator2.directive.ts
diff --git a/aio/content/examples/style-guide/src/07-01/app/app.component.html b/aio/content/examples/styleguide/src/07-01/app/app.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/07-01/app/app.component.html
rename to aio/content/examples/styleguide/src/07-01/app/app.component.html
diff --git a/aio/content/examples/style-guide/src/07-01/app/app.component.ts b/aio/content/examples/styleguide/src/07-01/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-01/app/app.component.ts
rename to aio/content/examples/styleguide/src/07-01/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/07-01/app/app.module.ts b/aio/content/examples/styleguide/src/07-01/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-01/app/app.module.ts
rename to aio/content/examples/styleguide/src/07-01/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/07-01/app/heroes/index.ts b/aio/content/examples/styleguide/src/07-01/app/heroes/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-01/app/heroes/index.ts
rename to aio/content/examples/styleguide/src/07-01/app/heroes/index.ts
diff --git a/aio/content/examples/style-guide/src/07-01/app/heroes/shared/hero.model.ts b/aio/content/examples/styleguide/src/07-01/app/heroes/shared/hero.model.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-01/app/heroes/shared/hero.model.ts
rename to aio/content/examples/styleguide/src/07-01/app/heroes/shared/hero.model.ts
diff --git a/aio/content/examples/style-guide/src/07-01/app/heroes/shared/hero.service.ts b/aio/content/examples/styleguide/src/07-01/app/heroes/shared/hero.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-01/app/heroes/shared/hero.service.ts
rename to aio/content/examples/styleguide/src/07-01/app/heroes/shared/hero.service.ts
diff --git a/aio/content/examples/style-guide/src/07-01/app/heroes/shared/index.ts b/aio/content/examples/styleguide/src/07-01/app/heroes/shared/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-01/app/heroes/shared/index.ts
rename to aio/content/examples/styleguide/src/07-01/app/heroes/shared/index.ts
diff --git a/aio/content/examples/style-guide/src/07-01/app/index.ts b/aio/content/examples/styleguide/src/07-01/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-01/app/index.ts
rename to aio/content/examples/styleguide/src/07-01/app/index.ts
diff --git a/aio/content/examples/style-guide/src/07-03/app/app.component.ts b/aio/content/examples/styleguide/src/07-03/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-03/app/app.component.ts
rename to aio/content/examples/styleguide/src/07-03/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/07-03/app/app.module.ts b/aio/content/examples/styleguide/src/07-03/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-03/app/app.module.ts
rename to aio/content/examples/styleguide/src/07-03/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/07-03/app/heroes/hero-list/hero-list.component.ts b/aio/content/examples/styleguide/src/07-03/app/heroes/hero-list/hero-list.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-03/app/heroes/hero-list/hero-list.component.ts
rename to aio/content/examples/styleguide/src/07-03/app/heroes/hero-list/hero-list.component.ts
diff --git a/aio/content/examples/style-guide/src/07-03/app/heroes/hero-list/index.ts b/aio/content/examples/styleguide/src/07-03/app/heroes/hero-list/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-03/app/heroes/hero-list/index.ts
rename to aio/content/examples/styleguide/src/07-03/app/heroes/hero-list/index.ts
diff --git a/aio/content/examples/style-guide/src/07-03/app/heroes/index.ts b/aio/content/examples/styleguide/src/07-03/app/heroes/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-03/app/heroes/index.ts
rename to aio/content/examples/styleguide/src/07-03/app/heroes/index.ts
diff --git a/aio/content/examples/style-guide/src/07-03/app/heroes/shared/hero.model.ts b/aio/content/examples/styleguide/src/07-03/app/heroes/shared/hero.model.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-03/app/heroes/shared/hero.model.ts
rename to aio/content/examples/styleguide/src/07-03/app/heroes/shared/hero.model.ts
diff --git a/aio/content/examples/style-guide/src/07-03/app/heroes/shared/hero.service.ts b/aio/content/examples/styleguide/src/07-03/app/heroes/shared/hero.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-03/app/heroes/shared/hero.service.ts
rename to aio/content/examples/styleguide/src/07-03/app/heroes/shared/hero.service.ts
diff --git a/aio/content/examples/style-guide/src/07-03/app/heroes/shared/index.ts b/aio/content/examples/styleguide/src/07-03/app/heroes/shared/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-03/app/heroes/shared/index.ts
rename to aio/content/examples/styleguide/src/07-03/app/heroes/shared/index.ts
diff --git a/aio/content/examples/style-guide/src/07-03/app/index.ts b/aio/content/examples/styleguide/src/07-03/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-03/app/index.ts
rename to aio/content/examples/styleguide/src/07-03/app/index.ts
diff --git a/aio/content/examples/style-guide/src/07-04/app/app.component.ts b/aio/content/examples/styleguide/src/07-04/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-04/app/app.component.ts
rename to aio/content/examples/styleguide/src/07-04/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/07-04/app/app.module.ts b/aio/content/examples/styleguide/src/07-04/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-04/app/app.module.ts
rename to aio/content/examples/styleguide/src/07-04/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/07-04/app/heroes/index.ts b/aio/content/examples/styleguide/src/07-04/app/heroes/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-04/app/heroes/index.ts
rename to aio/content/examples/styleguide/src/07-04/app/heroes/index.ts
diff --git a/aio/content/examples/style-guide/src/07-04/app/heroes/shared/hero-arena.service.avoid.ts b/aio/content/examples/styleguide/src/07-04/app/heroes/shared/hero-arena.service.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-04/app/heroes/shared/hero-arena.service.avoid.ts
rename to aio/content/examples/styleguide/src/07-04/app/heroes/shared/hero-arena.service.avoid.ts
diff --git a/aio/content/examples/style-guide/src/07-04/app/heroes/shared/hero-arena.service.ts b/aio/content/examples/styleguide/src/07-04/app/heroes/shared/hero-arena.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-04/app/heroes/shared/hero-arena.service.ts
rename to aio/content/examples/styleguide/src/07-04/app/heroes/shared/hero-arena.service.ts
diff --git a/aio/content/examples/style-guide/src/07-04/app/heroes/shared/hero.model.ts b/aio/content/examples/styleguide/src/07-04/app/heroes/shared/hero.model.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-04/app/heroes/shared/hero.model.ts
rename to aio/content/examples/styleguide/src/07-04/app/heroes/shared/hero.model.ts
diff --git a/aio/content/examples/style-guide/src/07-04/app/heroes/shared/hero.service.ts b/aio/content/examples/styleguide/src/07-04/app/heroes/shared/hero.service.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-04/app/heroes/shared/hero.service.ts
rename to aio/content/examples/styleguide/src/07-04/app/heroes/shared/hero.service.ts
diff --git a/aio/content/examples/style-guide/src/07-04/app/heroes/shared/index.ts b/aio/content/examples/styleguide/src/07-04/app/heroes/shared/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-04/app/heroes/shared/index.ts
rename to aio/content/examples/styleguide/src/07-04/app/heroes/shared/index.ts
diff --git a/aio/content/examples/style-guide/src/07-04/app/index.ts b/aio/content/examples/styleguide/src/07-04/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/07-04/app/index.ts
rename to aio/content/examples/styleguide/src/07-04/app/index.ts
diff --git a/aio/content/examples/style-guide/src/09-01/app/app.component.ts b/aio/content/examples/styleguide/src/09-01/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/09-01/app/app.component.ts
rename to aio/content/examples/styleguide/src/09-01/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/09-01/app/app.module.ts b/aio/content/examples/styleguide/src/09-01/app/app.module.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/09-01/app/app.module.ts
rename to aio/content/examples/styleguide/src/09-01/app/app.module.ts
diff --git a/aio/content/examples/style-guide/src/09-01/app/heroes/index.ts b/aio/content/examples/styleguide/src/09-01/app/heroes/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/09-01/app/heroes/index.ts
rename to aio/content/examples/styleguide/src/09-01/app/heroes/index.ts
diff --git a/aio/content/examples/style-guide/src/09-01/app/heroes/shared/hero-button/hero-button.component.avoid.ts b/aio/content/examples/styleguide/src/09-01/app/heroes/shared/hero-button/hero-button.component.avoid.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/09-01/app/heroes/shared/hero-button/hero-button.component.avoid.ts
rename to aio/content/examples/styleguide/src/09-01/app/heroes/shared/hero-button/hero-button.component.avoid.ts
diff --git a/aio/content/examples/style-guide/src/09-01/app/heroes/shared/hero-button/hero-button.component.ts b/aio/content/examples/styleguide/src/09-01/app/heroes/shared/hero-button/hero-button.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/09-01/app/heroes/shared/hero-button/hero-button.component.ts
rename to aio/content/examples/styleguide/src/09-01/app/heroes/shared/hero-button/hero-button.component.ts
diff --git a/aio/content/examples/style-guide/src/09-01/app/heroes/shared/hero-button/index.ts b/aio/content/examples/styleguide/src/09-01/app/heroes/shared/hero-button/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/09-01/app/heroes/shared/hero-button/index.ts
rename to aio/content/examples/styleguide/src/09-01/app/heroes/shared/hero-button/index.ts
diff --git a/aio/content/examples/style-guide/src/09-01/app/heroes/shared/index.ts b/aio/content/examples/styleguide/src/09-01/app/heroes/shared/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/09-01/app/heroes/shared/index.ts
rename to aio/content/examples/styleguide/src/09-01/app/heroes/shared/index.ts
diff --git a/aio/content/examples/style-guide/src/09-01/app/index.ts b/aio/content/examples/styleguide/src/09-01/app/index.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/09-01/app/index.ts
rename to aio/content/examples/styleguide/src/09-01/app/index.ts
diff --git a/aio/content/examples/style-guide/src/app/app.component.html b/aio/content/examples/styleguide/src/app/app.component.html
similarity index 100%
rename from aio/content/examples/style-guide/src/app/app.component.html
rename to aio/content/examples/styleguide/src/app/app.component.html
diff --git a/aio/content/examples/style-guide/src/app/app.component.ts b/aio/content/examples/styleguide/src/app/app.component.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/app/app.component.ts
rename to aio/content/examples/styleguide/src/app/app.component.ts
diff --git a/aio/content/examples/style-guide/src/app/app.routes.ts b/aio/content/examples/styleguide/src/app/app.routes.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/app/app.routes.ts
rename to aio/content/examples/styleguide/src/app/app.routes.ts
diff --git a/aio/content/examples/style-guide/src/app/hero-data.ts b/aio/content/examples/styleguide/src/app/hero-data.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/app/hero-data.ts
rename to aio/content/examples/styleguide/src/app/hero-data.ts
diff --git a/aio/content/examples/style-guide/src/index.html b/aio/content/examples/styleguide/src/index.html
similarity index 100%
rename from aio/content/examples/style-guide/src/index.html
rename to aio/content/examples/styleguide/src/index.html
diff --git a/aio/content/examples/style-guide/src/main.ts b/aio/content/examples/styleguide/src/main.ts
similarity index 100%
rename from aio/content/examples/style-guide/src/main.ts
rename to aio/content/examples/styleguide/src/main.ts
diff --git a/aio/content/examples/style-guide/src/systemjs.custom.js b/aio/content/examples/styleguide/src/systemjs.custom.js
similarity index 100%
rename from aio/content/examples/style-guide/src/systemjs.custom.js
rename to aio/content/examples/styleguide/src/systemjs.custom.js
diff --git a/aio/content/examples/testing/src/app/bag/bag.ts b/aio/content/examples/testing/src/app/bag/bag.ts
index cbf1c21136..521f390cfe 100644
--- a/aio/content/examples/testing/src/app/bag/bag.ts
+++ b/aio/content/examples/testing/src/app/bag/bag.ts
@@ -163,7 +163,7 @@ export class InputComponent {
 //   valueChange: EventEmitter<any> = new EventEmitter();
 // }
 
-// As the style-guide recommends
+// As the styleguide recommends
 @Directive({ selector: 'input[value]' })
 export class InputValueBinderDirective {
   @HostBinding()
diff --git a/aio/content/examples/toh-pt6/e2e-spec.ts b/aio/content/examples/toh-pt6/e2e-spec.ts
index 80d9660263..e49a2db234 100644
--- a/aio/content/examples/toh-pt6/e2e-spec.ts
+++ b/aio/content/examples/toh-pt6/e2e-spec.ts
@@ -108,7 +108,7 @@ describe('Tutorial part 6', () => {
 
     it(`cancels and shows ${targetHero.name} in Dashboard`, () => {
       element(by.buttonText('Back')).click();
-      browser.waitForAngular(); // seems necessary to gets tests to past for toh-6
+      browser.waitForAngular(); // seems necessary to gets tests to past for toh-pt6
 
       let targetHeroElt = getPageElts().topHeroes.get(targetHeroDashboardIndex);
       expect(targetHeroElt.getText()).toEqual(targetHero.name);
@@ -120,7 +120,7 @@ describe('Tutorial part 6', () => {
 
     it(`saves and shows ${newHeroName} in Dashboard`, () => {
       element(by.buttonText('Save')).click();
-      browser.waitForAngular(); // seems necessary to gets tests to past for toh-6
+      browser.waitForAngular(); // seems necessary to gets tests to past for toh-pt6
 
       let targetHeroElt = getPageElts().topHeroes.get(targetHeroDashboardIndex);
       expect(targetHeroElt.getText()).toEqual(newHeroName);
@@ -164,7 +164,7 @@ describe('Tutorial part 6', () => {
 
     it(`shows ${newHeroName} in Heroes list`, () => {
       element(by.buttonText('Save')).click();
-      browser.waitForAngular(); // seems necessary to gets tests to past for toh-6
+      browser.waitForAngular(); // seems necessary to gets tests to past for toh-pt6
       let expectedHero = {id: targetHero.id, name: newHeroName};
       expect(Hero.fromLi(getHeroLiEltById(targetHero.id))).toEqual(expectedHero);
     });
@@ -242,7 +242,7 @@ describe('Tutorial part 6', () => {
     let targetHeroElt = getPageElts().topHeroes.get(targetHeroDashboardIndex);
     expect(targetHeroElt.getText()).toEqual(targetHero.name);
     targetHeroElt.click();
-    browser.waitForAngular(); // seems necessary to gets tests to past for toh-6
+    browser.waitForAngular(); // seems necessary to gets tests to past for toh-pt6
 
     let page = getPageElts();
     expect(page.heroDetail.isPresent()).toBeTruthy('shows hero detail');
diff --git a/aio/content/examples/cb-ts-to-js/e2e-spec.ts b/aio/content/examples/ts-to-js/e2e-spec.ts
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/e2e-spec.ts
rename to aio/content/examples/ts-to-js/e2e-spec.ts
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/example-config.json b/aio/content/examples/ts-to-js/js-es6-decorators/example-config.json
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/example-config.json
rename to aio/content/examples/ts-to-js/js-es6-decorators/example-config.json
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/plnkr.json b/aio/content/examples/ts-to-js/js-es6-decorators/plnkr.json
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/plnkr.json
rename to aio/content/examples/ts-to-js/js-es6-decorators/plnkr.json
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/.babelrc b/aio/content/examples/ts-to-js/js-es6-decorators/src/.babelrc
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/.babelrc
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/.babelrc
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/app.component.es6 b/aio/content/examples/ts-to-js/js-es6-decorators/src/app/app.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/app.component.es6
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/app/app.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/app.component.html b/aio/content/examples/ts-to-js/js-es6-decorators/src/app/app.component.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/app.component.html
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/app/app.component.html
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/app.module.es6 b/aio/content/examples/ts-to-js/js-es6-decorators/src/app/app.module.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/app.module.es6
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/app/app.module.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/confirm.component.es6 b/aio/content/examples/ts-to-js/js-es6-decorators/src/app/confirm.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/confirm.component.es6
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/app/confirm.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/confirm.component.html b/aio/content/examples/ts-to-js/js-es6-decorators/src/app/confirm.component.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/confirm.component.html
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/app/confirm.component.html
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/data.service.es6 b/aio/content/examples/ts-to-js/js-es6-decorators/src/app/data.service.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/data.service.es6
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/app/data.service.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-di-inject-additional.component.es6 b/aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-di-inject-additional.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-di-inject-additional.component.es6
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-di-inject-additional.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-di-inject.component.es6 b/aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-di-inject.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-di-inject.component.es6
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-di-inject.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-di.component.es6 b/aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-di.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-di.component.es6
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-di.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-host-meta.component.es6 b/aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-host-meta.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-host-meta.component.es6
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-host-meta.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-host.component.es6 b/aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-host.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-host.component.es6
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-host.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-io.component.es6 b/aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-io.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-io.component.es6
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-io.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-lifecycle.component.es6 b/aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-lifecycle.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-lifecycle.component.es6
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-lifecycle.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-queries.component.es6 b/aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-queries.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-queries.component.es6
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-queries.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-title.component.es6 b/aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-title.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-title.component.es6
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-title.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-title.component.html b/aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-title.component.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero-title.component.html
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero-title.component.html
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero.component.es6 b/aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/app/hero.component.es6
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/app/hero.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/index.html b/aio/content/examples/ts-to-js/js-es6-decorators/src/index.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/index.html
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/index.html
diff --git a/aio/content/examples/cb-ts-to-js/js-es6-decorators/src/main.es6 b/aio/content/examples/ts-to-js/js-es6-decorators/src/main.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6-decorators/src/main.es6
rename to aio/content/examples/ts-to-js/js-es6-decorators/src/main.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/example-config.json b/aio/content/examples/ts-to-js/js-es6/example-config.json
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/example-config.json
rename to aio/content/examples/ts-to-js/js-es6/example-config.json
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/plnkr.json b/aio/content/examples/ts-to-js/js-es6/plnkr.json
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/plnkr.json
rename to aio/content/examples/ts-to-js/js-es6/plnkr.json
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/.babelrc b/aio/content/examples/ts-to-js/js-es6/src/.babelrc
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/.babelrc
rename to aio/content/examples/ts-to-js/js-es6/src/.babelrc
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/app/app.component.es6 b/aio/content/examples/ts-to-js/js-es6/src/app/app.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/app/app.component.es6
rename to aio/content/examples/ts-to-js/js-es6/src/app/app.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/app/app.component.html b/aio/content/examples/ts-to-js/js-es6/src/app/app.component.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/app/app.component.html
rename to aio/content/examples/ts-to-js/js-es6/src/app/app.component.html
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/app/app.module.es6 b/aio/content/examples/ts-to-js/js-es6/src/app/app.module.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/app/app.module.es6
rename to aio/content/examples/ts-to-js/js-es6/src/app/app.module.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/app/confirm.component.es6 b/aio/content/examples/ts-to-js/js-es6/src/app/confirm.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/app/confirm.component.es6
rename to aio/content/examples/ts-to-js/js-es6/src/app/confirm.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/app/confirm.component.html b/aio/content/examples/ts-to-js/js-es6/src/app/confirm.component.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/app/confirm.component.html
rename to aio/content/examples/ts-to-js/js-es6/src/app/confirm.component.html
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/app/data.service.es6 b/aio/content/examples/ts-to-js/js-es6/src/app/data.service.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/app/data.service.es6
rename to aio/content/examples/ts-to-js/js-es6/src/app/data.service.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-di-inject-additional.component.es6 b/aio/content/examples/ts-to-js/js-es6/src/app/hero-di-inject-additional.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-di-inject-additional.component.es6
rename to aio/content/examples/ts-to-js/js-es6/src/app/hero-di-inject-additional.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-di-inject.component.es6 b/aio/content/examples/ts-to-js/js-es6/src/app/hero-di-inject.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-di-inject.component.es6
rename to aio/content/examples/ts-to-js/js-es6/src/app/hero-di-inject.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-di.component.es6 b/aio/content/examples/ts-to-js/js-es6/src/app/hero-di.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-di.component.es6
rename to aio/content/examples/ts-to-js/js-es6/src/app/hero-di.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-host.component.es6 b/aio/content/examples/ts-to-js/js-es6/src/app/hero-host.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-host.component.es6
rename to aio/content/examples/ts-to-js/js-es6/src/app/hero-host.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-io.component.es6 b/aio/content/examples/ts-to-js/js-es6/src/app/hero-io.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-io.component.es6
rename to aio/content/examples/ts-to-js/js-es6/src/app/hero-io.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-lifecycle.component.es6 b/aio/content/examples/ts-to-js/js-es6/src/app/hero-lifecycle.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-lifecycle.component.es6
rename to aio/content/examples/ts-to-js/js-es6/src/app/hero-lifecycle.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-queries.component.es6 b/aio/content/examples/ts-to-js/js-es6/src/app/hero-queries.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-queries.component.es6
rename to aio/content/examples/ts-to-js/js-es6/src/app/hero-queries.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-title.component.es6 b/aio/content/examples/ts-to-js/js-es6/src/app/hero-title.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-title.component.es6
rename to aio/content/examples/ts-to-js/js-es6/src/app/hero-title.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-title.component.html b/aio/content/examples/ts-to-js/js-es6/src/app/hero-title.component.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/app/hero-title.component.html
rename to aio/content/examples/ts-to-js/js-es6/src/app/hero-title.component.html
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/app/hero.component.es6 b/aio/content/examples/ts-to-js/js-es6/src/app/hero.component.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/app/hero.component.es6
rename to aio/content/examples/ts-to-js/js-es6/src/app/hero.component.es6
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/index.html b/aio/content/examples/ts-to-js/js-es6/src/index.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/index.html
rename to aio/content/examples/ts-to-js/js-es6/src/index.html
diff --git a/aio/content/examples/cb-ts-to-js/js-es6/src/main.es6 b/aio/content/examples/ts-to-js/js-es6/src/main.es6
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js-es6/src/main.es6
rename to aio/content/examples/ts-to-js/js-es6/src/main.es6
diff --git a/aio/content/examples/cb-ts-to-js/js/example-config.json b/aio/content/examples/ts-to-js/js/example-config.json
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/example-config.json
rename to aio/content/examples/ts-to-js/js/example-config.json
diff --git a/aio/content/examples/cb-ts-to-js/js/plnkr.json b/aio/content/examples/ts-to-js/js/plnkr.json
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/plnkr.json
rename to aio/content/examples/ts-to-js/js/plnkr.json
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/app.component.html b/aio/content/examples/ts-to-js/js/src/app/app.component.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/app.component.html
rename to aio/content/examples/ts-to-js/js/src/app/app.component.html
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/app.component.js b/aio/content/examples/ts-to-js/js/src/app/app.component.js
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/app.component.js
rename to aio/content/examples/ts-to-js/js/src/app/app.component.js
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/app.module.js b/aio/content/examples/ts-to-js/js/src/app/app.module.js
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/app.module.js
rename to aio/content/examples/ts-to-js/js/src/app/app.module.js
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/confirm.component.html b/aio/content/examples/ts-to-js/js/src/app/confirm.component.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/confirm.component.html
rename to aio/content/examples/ts-to-js/js/src/app/confirm.component.html
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/confirm.component.js b/aio/content/examples/ts-to-js/js/src/app/confirm.component.js
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/confirm.component.js
rename to aio/content/examples/ts-to-js/js/src/app/confirm.component.js
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/data.service.js b/aio/content/examples/ts-to-js/js/src/app/data.service.js
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/data.service.js
rename to aio/content/examples/ts-to-js/js/src/app/data.service.js
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/hero-di-inject-additional.component.js b/aio/content/examples/ts-to-js/js/src/app/hero-di-inject-additional.component.js
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/hero-di-inject-additional.component.js
rename to aio/content/examples/ts-to-js/js/src/app/hero-di-inject-additional.component.js
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/hero-di-inject.component.js b/aio/content/examples/ts-to-js/js/src/app/hero-di-inject.component.js
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/hero-di-inject.component.js
rename to aio/content/examples/ts-to-js/js/src/app/hero-di-inject.component.js
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/hero-di.component.js b/aio/content/examples/ts-to-js/js/src/app/hero-di.component.js
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/hero-di.component.js
rename to aio/content/examples/ts-to-js/js/src/app/hero-di.component.js
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/hero-host.component.js b/aio/content/examples/ts-to-js/js/src/app/hero-host.component.js
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/hero-host.component.js
rename to aio/content/examples/ts-to-js/js/src/app/hero-host.component.js
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/hero-io-dsl.component.html b/aio/content/examples/ts-to-js/js/src/app/hero-io-dsl.component.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/hero-io-dsl.component.html
rename to aio/content/examples/ts-to-js/js/src/app/hero-io-dsl.component.html
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/hero-io.component.html b/aio/content/examples/ts-to-js/js/src/app/hero-io.component.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/hero-io.component.html
rename to aio/content/examples/ts-to-js/js/src/app/hero-io.component.html
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/hero-io.component.js b/aio/content/examples/ts-to-js/js/src/app/hero-io.component.js
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/hero-io.component.js
rename to aio/content/examples/ts-to-js/js/src/app/hero-io.component.js
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/hero-lifecycle.component.js b/aio/content/examples/ts-to-js/js/src/app/hero-lifecycle.component.js
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/hero-lifecycle.component.js
rename to aio/content/examples/ts-to-js/js/src/app/hero-lifecycle.component.js
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/hero-queries.component.js b/aio/content/examples/ts-to-js/js/src/app/hero-queries.component.js
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/hero-queries.component.js
rename to aio/content/examples/ts-to-js/js/src/app/hero-queries.component.js
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/hero-title.component.html b/aio/content/examples/ts-to-js/js/src/app/hero-title.component.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/hero-title.component.html
rename to aio/content/examples/ts-to-js/js/src/app/hero-title.component.html
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/hero-title.component.js b/aio/content/examples/ts-to-js/js/src/app/hero-title.component.js
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/hero-title.component.js
rename to aio/content/examples/ts-to-js/js/src/app/hero-title.component.js
diff --git a/aio/content/examples/cb-ts-to-js/js/src/app/hero.component.js b/aio/content/examples/ts-to-js/js/src/app/hero.component.js
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/app/hero.component.js
rename to aio/content/examples/ts-to-js/js/src/app/hero.component.js
diff --git a/aio/content/examples/cb-ts-to-js/js/src/index.html b/aio/content/examples/ts-to-js/js/src/index.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/index.html
rename to aio/content/examples/ts-to-js/js/src/index.html
diff --git a/aio/content/examples/cb-ts-to-js/js/src/main.js b/aio/content/examples/ts-to-js/js/src/main.js
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/js/src/main.js
rename to aio/content/examples/ts-to-js/js/src/main.js
diff --git a/aio/content/examples/style-guide/example-config.json b/aio/content/examples/ts-to-js/ts/example-config.json
similarity index 100%
rename from aio/content/examples/style-guide/example-config.json
rename to aio/content/examples/ts-to-js/ts/example-config.json
diff --git a/aio/content/examples/cb-ts-to-js/ts/plnkr.json b/aio/content/examples/ts-to-js/ts/plnkr.json
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/plnkr.json
rename to aio/content/examples/ts-to-js/ts/plnkr.json
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/app/app.component.html b/aio/content/examples/ts-to-js/ts/src/app/app.component.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/app/app.component.html
rename to aio/content/examples/ts-to-js/ts/src/app/app.component.html
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/app/app.component.ts b/aio/content/examples/ts-to-js/ts/src/app/app.component.ts
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/app/app.component.ts
rename to aio/content/examples/ts-to-js/ts/src/app/app.component.ts
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/app/app.module.ts b/aio/content/examples/ts-to-js/ts/src/app/app.module.ts
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/app/app.module.ts
rename to aio/content/examples/ts-to-js/ts/src/app/app.module.ts
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/app/confirm.component.html b/aio/content/examples/ts-to-js/ts/src/app/confirm.component.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/app/confirm.component.html
rename to aio/content/examples/ts-to-js/ts/src/app/confirm.component.html
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/app/confirm.component.ts b/aio/content/examples/ts-to-js/ts/src/app/confirm.component.ts
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/app/confirm.component.ts
rename to aio/content/examples/ts-to-js/ts/src/app/confirm.component.ts
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/app/data.service.ts b/aio/content/examples/ts-to-js/ts/src/app/data.service.ts
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/app/data.service.ts
rename to aio/content/examples/ts-to-js/ts/src/app/data.service.ts
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/app/hero-di-inject-additional.component.ts b/aio/content/examples/ts-to-js/ts/src/app/hero-di-inject-additional.component.ts
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/app/hero-di-inject-additional.component.ts
rename to aio/content/examples/ts-to-js/ts/src/app/hero-di-inject-additional.component.ts
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/app/hero-di-inject.component.ts b/aio/content/examples/ts-to-js/ts/src/app/hero-di-inject.component.ts
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/app/hero-di-inject.component.ts
rename to aio/content/examples/ts-to-js/ts/src/app/hero-di-inject.component.ts
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/app/hero-di.component.ts b/aio/content/examples/ts-to-js/ts/src/app/hero-di.component.ts
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/app/hero-di.component.ts
rename to aio/content/examples/ts-to-js/ts/src/app/hero-di.component.ts
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/app/hero-host-meta.component.ts b/aio/content/examples/ts-to-js/ts/src/app/hero-host-meta.component.ts
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/app/hero-host-meta.component.ts
rename to aio/content/examples/ts-to-js/ts/src/app/hero-host-meta.component.ts
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/app/hero-host.component.ts b/aio/content/examples/ts-to-js/ts/src/app/hero-host.component.ts
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/app/hero-host.component.ts
rename to aio/content/examples/ts-to-js/ts/src/app/hero-host.component.ts
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/app/hero-io.component.ts b/aio/content/examples/ts-to-js/ts/src/app/hero-io.component.ts
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/app/hero-io.component.ts
rename to aio/content/examples/ts-to-js/ts/src/app/hero-io.component.ts
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/app/hero-lifecycle.component.ts b/aio/content/examples/ts-to-js/ts/src/app/hero-lifecycle.component.ts
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/app/hero-lifecycle.component.ts
rename to aio/content/examples/ts-to-js/ts/src/app/hero-lifecycle.component.ts
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/app/hero-queries.component.ts b/aio/content/examples/ts-to-js/ts/src/app/hero-queries.component.ts
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/app/hero-queries.component.ts
rename to aio/content/examples/ts-to-js/ts/src/app/hero-queries.component.ts
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/app/hero-title.component.html b/aio/content/examples/ts-to-js/ts/src/app/hero-title.component.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/app/hero-title.component.html
rename to aio/content/examples/ts-to-js/ts/src/app/hero-title.component.html
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/app/hero-title.component.ts b/aio/content/examples/ts-to-js/ts/src/app/hero-title.component.ts
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/app/hero-title.component.ts
rename to aio/content/examples/ts-to-js/ts/src/app/hero-title.component.ts
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/app/hero.component.ts b/aio/content/examples/ts-to-js/ts/src/app/hero.component.ts
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/app/hero.component.ts
rename to aio/content/examples/ts-to-js/ts/src/app/hero.component.ts
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/index.html b/aio/content/examples/ts-to-js/ts/src/index.html
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/index.html
rename to aio/content/examples/ts-to-js/ts/src/index.html
diff --git a/aio/content/examples/cb-ts-to-js/ts/src/main.ts b/aio/content/examples/ts-to-js/ts/src/main.ts
similarity index 100%
rename from aio/content/examples/cb-ts-to-js/ts/src/main.ts
rename to aio/content/examples/ts-to-js/ts/src/main.ts
diff --git a/aio/content/examples/cb-visual-studio-2015/.gitignore b/aio/content/examples/visual-studio-2015/.gitignore
similarity index 100%
rename from aio/content/examples/cb-visual-studio-2015/.gitignore
rename to aio/content/examples/visual-studio-2015/.gitignore
diff --git a/aio/content/examples/cb-visual-studio-2015/tsconfig.json b/aio/content/examples/visual-studio-2015/tsconfig.json
similarity index 100%
rename from aio/content/examples/cb-visual-studio-2015/tsconfig.json
rename to aio/content/examples/visual-studio-2015/tsconfig.json
diff --git a/aio/content/guide/ajs-quick-reference.md b/aio/content/guide/ajs-quick-reference.md
index 5889effca4..f5bd7c3f02 100644
--- a/aio/content/guide/ajs-quick-reference.md
+++ b/aio/content/guide/ajs-quick-reference.md
@@ -17,7 +17,7 @@ This guide helps you transition from AngularJS to Angular
 by mapping AngularJS syntax to the equivalent Angular syntax.
 
 
-**See the Angular syntax in this <live-example name="cb-ajs-quick-reference"></live-example>**.
+**See the Angular syntax in this <live-example name="ajs-quick-reference"></live-example>**.
 
 ## Contents
 
@@ -84,7 +84,7 @@ The following table lists some of the key AngularJS template features with their
 
 
       ### Bindings/interpolation
-      <code-example path="cb-ajs-quick-reference/src/app/movie-list.component.html" region="interpolation" title="cb-ajs-quick-reference/src/app/movie-list.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/movie-list.component.html" region="interpolation" title="ajs-quick-reference/src/app/movie-list.component.html" linenums="false">
 
       </code-example>
 
@@ -120,7 +120,7 @@ The following table lists some of the key AngularJS template features with their
 
 
       ### Pipes
-      <code-example path="cb-ajs-quick-reference/src/app/app.component.html" region="uppercase" title="cb-ajs-quick-reference/src/app/app.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/app.component.html" region="uppercase" title="ajs-quick-reference/src/app/app.component.html" linenums="false">
 
       </code-example>
 
@@ -154,7 +154,7 @@ The following table lists some of the key AngularJS template features with their
 
 
       ### Input variables
-      <code-example path="cb-ajs-quick-reference/src/app/app.component.html" region="local" title="cb-ajs-quick-reference/src/app/app.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/app.component.html" region="local" title="ajs-quick-reference/src/app/app.component.html" linenums="false">
 
       </code-example>
 
@@ -225,11 +225,11 @@ The following are some of the key AngularJS built-in directives and their equiva
 
 
       ### Bootstrapping
-      <code-example path="cb-ajs-quick-reference/src/main.ts" title="main.ts" linenums="false">
+      <code-example path="ajs-quick-reference/src/main.ts" title="main.ts" linenums="false">
 
       </code-example>
       <br>
-      <code-example path="cb-ajs-quick-reference/src/app/app.module.1.ts" title="app.module.ts" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/app.module.1.ts" title="app.module.ts" linenums="false">
 
       </code-example>
 
@@ -271,7 +271,7 @@ The following are some of the key AngularJS built-in directives and their equiva
 
 
       ### ngClass
-      <code-example path="cb-ajs-quick-reference/src/app/app.component.html" region="ngClass" title="cb-ajs-quick-reference/src/app/app.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/app.component.html" region="ngClass" title="ajs-quick-reference/src/app/app.component.html" linenums="false">
 
       </code-example>
 
@@ -317,7 +317,7 @@ The following are some of the key AngularJS built-in directives and their equiva
 
 
       ### Bind to the `click` event
-      <code-example path="cb-ajs-quick-reference/src/app/app.component.html" region="event-binding" title="cb-ajs-quick-reference/src/app/app.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/app.component.html" region="event-binding" title="ajs-quick-reference/src/app/app.component.html" linenums="false">
 
       </code-example>
 
@@ -364,7 +364,7 @@ The following are some of the key AngularJS built-in directives and their equiva
 
 
       ### Component decorator
-      <code-example path="cb-ajs-quick-reference/src/app/movie-list.component.ts" region="component" title="cb-ajs-quick-reference/src/app/movie-list.component.ts" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/movie-list.component.ts" region="component" title="ajs-quick-reference/src/app/movie-list.component.ts" linenums="false">
 
       </code-example>
 
@@ -426,7 +426,7 @@ The following are some of the key AngularJS built-in directives and their equiva
 
 
       ### Bind to the `href` property
-      <code-example path="cb-ajs-quick-reference/src/app/app.component.html" region="href" title="cb-ajs-quick-reference/src/app/app.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/app.component.html" region="href" title="ajs-quick-reference/src/app/app.component.html" linenums="false">
 
       </code-example>
 
@@ -438,7 +438,7 @@ The following are some of the key AngularJS built-in directives and their equiva
       section of the [Template Syntax](guide/template-syntax) page.
 
       In Angular, `href` is no longer used for routing. Routing uses `routerLink`, as shown in the following example.
-      <code-example path="cb-ajs-quick-reference/src/app/app.component.html" region="router-link" title="cb-ajs-quick-reference/src/app/app.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/app.component.html" region="router-link" title="ajs-quick-reference/src/app/app.component.html" linenums="false">
 
       </code-example>
 
@@ -471,7 +471,7 @@ The following are some of the key AngularJS built-in directives and their equiva
 
 
       ### *ngIf
-      <code-example path="cb-ajs-quick-reference/src/app/movie-list.component.html" region="ngIf" title="cb-ajs-quick-reference/src/app/movie-list.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/movie-list.component.html" region="ngIf" title="ajs-quick-reference/src/app/movie-list.component.html" linenums="false">
 
       </code-example>
 
@@ -506,7 +506,7 @@ The following are some of the key AngularJS built-in directives and their equiva
 
 
       ### ngModel
-      <code-example path="cb-ajs-quick-reference/src/app/movie-list.component.html" region="ngModel" title="cb-ajs-quick-reference/src/app/movie-list.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/movie-list.component.html" region="ngModel" title="ajs-quick-reference/src/app/movie-list.component.html" linenums="false">
 
       </code-example>
 
@@ -542,7 +542,7 @@ The following are some of the key AngularJS built-in directives and their equiva
 
 
       ### *ngFor
-      <code-example path="cb-ajs-quick-reference/src/app/movie-list.component.html" region="ngFor" title="cb-ajs-quick-reference/src/app/movie-list.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/movie-list.component.html" region="ngFor" title="ajs-quick-reference/src/app/movie-list.component.html" linenums="false">
 
       </code-example>
 
@@ -585,7 +585,7 @@ The following are some of the key AngularJS built-in directives and their equiva
 
 
       ### Bind to the `hidden` property
-      <code-example path="cb-ajs-quick-reference/src/app/movie-list.component.html" region="hidden" title="cb-ajs-quick-reference/src/app/movie-list.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/movie-list.component.html" region="hidden" title="ajs-quick-reference/src/app/movie-list.component.html" linenums="false">
 
       </code-example>
 
@@ -624,7 +624,7 @@ The following are some of the key AngularJS built-in directives and their equiva
 
 
       ### Bind to the `src` property
-      <code-example path="cb-ajs-quick-reference/src/app/app.component.html" region="src" title="cb-ajs-quick-reference/src/app/app.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/app.component.html" region="src" title="ajs-quick-reference/src/app/app.component.html" linenums="false">
 
       </code-example>
 
@@ -661,7 +661,7 @@ The following are some of the key AngularJS built-in directives and their equiva
 
 
       ### ngStyle
-      <code-example path="cb-ajs-quick-reference/src/app/app.component.html" region="ngStyle" title="cb-ajs-quick-reference/src/app/app.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/app.component.html" region="ngStyle" title="ajs-quick-reference/src/app/app.component.html" linenums="false">
 
       </code-example>
 
@@ -716,7 +716,7 @@ The following are some of the key AngularJS built-in directives and their equiva
 
 
       ### ngSwitch
-      <code-example path="cb-ajs-quick-reference/src/app/movie-list.component.html" region="ngSwitch" title="cb-ajs-quick-reference/src/app/movie-list.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/movie-list.component.html" region="ngSwitch" title="ajs-quick-reference/src/app/movie-list.component.html" linenums="false">
 
       </code-example>
 
@@ -795,7 +795,7 @@ For more information on pipes, see [Pipes](guide/pipes).
 
 
       ### currency
-      <code-example path="cb-ajs-quick-reference/src/app/app.component.html" region="currency" title="cb-ajs-quick-reference/src/app/app.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/app.component.html" region="currency" title="ajs-quick-reference/src/app/app.component.html" linenums="false">
 
       </code-example>
 
@@ -823,7 +823,7 @@ For more information on pipes, see [Pipes](guide/pipes).
 
 
       ### date
-      <code-example path="cb-ajs-quick-reference/src/app/app.component.html" region="date" title="cb-ajs-quick-reference/src/app/app.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/app.component.html" region="date" title="ajs-quick-reference/src/app/app.component.html" linenums="false">
 
       </code-example>
 
@@ -876,7 +876,7 @@ For more information on pipes, see [Pipes](guide/pipes).
 
 
       ### json
-      <code-example path="cb-ajs-quick-reference/src/app/app.component.html" region="json" title="cb-ajs-quick-reference/src/app/app.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/app.component.html" region="json" title="ajs-quick-reference/src/app/app.component.html" linenums="false">
 
       </code-example>
 
@@ -905,7 +905,7 @@ For more information on pipes, see [Pipes](guide/pipes).
 
 
       ### slice
-      <code-example path="cb-ajs-quick-reference/src/app/app.component.html" region="slice" title="cb-ajs-quick-reference/src/app/app.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/app.component.html" region="slice" title="ajs-quick-reference/src/app/app.component.html" linenums="false">
 
       </code-example>
 
@@ -936,7 +936,7 @@ For more information on pipes, see [Pipes](guide/pipes).
 
 
       ### lowercase
-      <code-example path="cb-ajs-quick-reference/src/app/app.component.html" region="lowercase" title="cb-ajs-quick-reference/src/app/app.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/app.component.html" region="lowercase" title="ajs-quick-reference/src/app/app.component.html" linenums="false">
 
       </code-example>
 
@@ -964,7 +964,7 @@ For more information on pipes, see [Pipes](guide/pipes).
 
 
       ### number
-      <code-example path="cb-ajs-quick-reference/src/app/app.component.html" region="number" title="cb-ajs-quick-reference/src/app/app.component.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/app.component.html" region="number" title="ajs-quick-reference/src/app/app.component.html" linenums="false">
 
       </code-example>
 
@@ -1098,7 +1098,7 @@ The Angular code is shown using TypeScript.
 
 
       ### Angular modules
-      <code-example path="cb-ajs-quick-reference/src/app/app.module.1.ts" title="cb-ajs-quick-reference/src/app/app.module.ts" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/app.module.1.ts" title="ajs-quick-reference/src/app/app.module.ts" linenums="false">
 
       </code-example>
 
@@ -1139,7 +1139,7 @@ The Angular code is shown using TypeScript.
 
 
       ### Component decorator
-      <code-example path="cb-ajs-quick-reference/src/app/movie-list.component.ts" region="component" title="cb-ajs-quick-reference/src/app/movie-list.component.ts" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/movie-list.component.ts" region="component" title="ajs-quick-reference/src/app/movie-list.component.ts" linenums="false">
 
       </code-example>
 
@@ -1175,7 +1175,7 @@ The Angular code is shown using TypeScript.
 
 
       ### Component class
-      <code-example path="cb-ajs-quick-reference/src/app/movie-list.component.ts" region="class" title="cb-ajs-quick-reference/src/app/movie-list.component.ts" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/movie-list.component.ts" region="class" title="ajs-quick-reference/src/app/movie-list.component.ts" linenums="false">
 
       </code-example>
 
@@ -1214,7 +1214,7 @@ The Angular code is shown using TypeScript.
 
 
       ### Dependency injection
-      <code-example path="cb-ajs-quick-reference/src/app/movie-list.component.ts" region="di" title="cb-ajs-quick-reference/src/app/movie-list.component.ts" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/movie-list.component.ts" region="di" title="ajs-quick-reference/src/app/movie-list.component.ts" linenums="false">
 
       </code-example>
 
@@ -1289,7 +1289,7 @@ also encapsulate a style sheet within a specific component.
 
 
       ### Link tag
-      <code-example path="cb-ajs-quick-reference/src/index.html" region="style" title="cb-ajs-quick-reference/src/index.html" linenums="false">
+      <code-example path="ajs-quick-reference/src/index.html" region="style" title="ajs-quick-reference/src/index.html" linenums="false">
 
       </code-example>
 
@@ -1300,7 +1300,7 @@ also encapsulate a style sheet within a specific component.
       ### StyleUrls
       In Angular, you can use the `styles` or `styleUrls` property of the `@Component` metadata to define
       a style sheet for a particular component.
-      <code-example path="cb-ajs-quick-reference/src/app/movie-list.component.ts" region="style-url" title="cb-ajs-quick-reference/src/app/movie-list.component.ts" linenums="false">
+      <code-example path="ajs-quick-reference/src/app/movie-list.component.ts" region="style-url" title="ajs-quick-reference/src/app/movie-list.component.ts" linenums="false">
 
       </code-example>
 
diff --git a/aio/content/guide/aot-compiler.md b/aio/content/guide/aot-compiler.md
index 6150b686e3..e808b645b9 100644
--- a/aio/content/guide/aot-compiler.md
+++ b/aio/content/guide/aot-compiler.md
@@ -111,9 +111,9 @@ Take the <a href='../guide/setup.html'>Setup</a> as a starting point.
 A few minor changes to the lone `app.component` lead to these two class and HTML files:
 
 <code-tabs>
-  <code-pane title="src/app/app.component.html" path="cb-aot-compiler/src/app/app.component.html">
+  <code-pane title="src/app/app.component.html" path="aot-compiler/src/app/app.component.html">
   </code-pane>
-  <code-pane title="src/app/app.component.ts" path="cb-aot-compiler/src/app/app.component.ts">
+  <code-pane title="src/app/app.component.ts" path="aot-compiler/src/app/app.component.ts">
   </code-pane>
 </code-tabs>
 
@@ -132,7 +132,7 @@ instead of the TypeScript compiler (`tsc`).
 Copy the original `src/tsconfig.json` to a file called `tsconfig-aot.json` on the project root,
 then modify it as follows.
 
-<code-example path="cb-aot-compiler/tsconfig-aot.json" title="tsconfig-aot.json" linenums="false">
+<code-example path="aot-compiler/tsconfig-aot.json" title="tsconfig-aot.json" linenums="false">
 </code-example>
 
 The `compilerOptions` section is unchanged except for one property.
@@ -215,9 +215,9 @@ Switch from the `platformBrowserDynamic.bootstrap` used in JIT compilation to
 Here is AOT bootstrap in `main.ts` next to the original JIT version:
 
 <code-tabs>
-  <code-pane title="src/main.ts" path="cb-aot-compiler/src/main.ts">
+  <code-pane title="src/main.ts" path="aot-compiler/src/main.ts">
   </code-pane>
-  <code-pane title="src/main-jit.ts" path="cb-aot-compiler/src/main-jit.ts">
+  <code-pane title="src/main-jit.ts" path="aot-compiler/src/main-jit.ts">
   </code-pane>
 </code-tabs>
 
@@ -272,7 +272,7 @@ Next, create a configuration file (`rollup-config.js`)
 in the project root directory to tell Rollup how to process the application.
 The cookbook configuration file looks like this.
 
-<code-example path="cb-aot-compiler/rollup-config.js" title="rollup-config.js" linenums="false">
+<code-example path="aot-compiler/rollup-config.js" title="rollup-config.js" linenums="false">
 </code-example>
 
 This config file tells Rollup that the app entry point is `src/app/main.js` .
@@ -301,7 +301,7 @@ Rollup then preserves the parts of `RxJS` referenced by the application
 in the final bundle. Using it is straigthforward. Add the following to 
 the `plugins` array in `rollup-config.js`:
 
-<code-example path="cb-aot-compiler/rollup-config.js" region="commonjs" title="rollup-config.js (CommonJs to ES2015 Plugin)" linenums="false">
+<code-example path="aot-compiler/rollup-config.js" region="commonjs" title="rollup-config.js (CommonJs to ES2015 Plugin)" linenums="false">
 </code-example>
 
 *Minification*
@@ -310,7 +310,7 @@ Rollup tree shaking reduces code size considerably.  Minification makes it small
 This cookbook relies on the _uglify_ Rollup plugin to minify and mangle the code. 
 Add the following to the `plugins` array:
 
-<code-example path="cb-aot-compiler/rollup-config.js" region="uglify" title="rollup-config.js (CommonJs to ES2015 Plugin)" linenums="false">
+<code-example path="aot-compiler/rollup-config.js" region="uglify" title="rollup-config.js (CommonJs to ES2015 Plugin)" linenums="false">
 </code-example>
 
 <div class="l-sub-section">
@@ -347,7 +347,7 @@ Loading the generated application bundle does not require a module loader like S
 Remove the scripts that concern SystemJS.
 Instead, load the bundle file using a single `<script>` tag **_after_** the `</body>` tag:
 
-<code-example path="cb-aot-compiler/src/index.html" region="bundle" title="index.html (load bundle)" linenums="false">
+<code-example path="aot-compiler/src/index.html" region="bundle" title="index.html (load bundle)" linenums="false">
 </code-example>
 
 {@a serve}
@@ -370,17 +370,17 @@ The server starts, launches a browser, and the app should appear.
 Here's the pertinent source code:
 
 <code-tabs>
-  <code-pane title="src/app/app.component.html" path="cb-aot-compiler/src/app/app.component.html">
+  <code-pane title="src/app/app.component.html" path="aot-compiler/src/app/app.component.html">
   </code-pane>
-  <code-pane title="src/app/app.component.ts" path="cb-aot-compiler/src/app/app.component.ts">
+  <code-pane title="src/app/app.component.ts" path="aot-compiler/src/app/app.component.ts">
   </code-pane>
-  <code-pane title="src/main.ts" path="cb-aot-compiler/src/main.ts">
+  <code-pane title="src/main.ts" path="aot-compiler/src/main.ts">
   </code-pane>
-  <code-pane title="src/index.html" path="cb-aot-compiler/src/index.html">
+  <code-pane title="src/index.html" path="aot-compiler/src/index.html">
   </code-pane>
-  <code-pane title="tsconfig-aot.json" path="cb-aot-compiler/tsconfig-aot.json">
+  <code-pane title="tsconfig-aot.json" path="aot-compiler/tsconfig-aot.json">
   </code-pane>
-  <code-pane title="rollup-config.js" path="cb-aot-compiler/rollup-config.js">
+  <code-pane title="rollup-config.js" path="aot-compiler/rollup-config.js">
   </code-pane>
 </code-tabs>
 
@@ -411,7 +411,7 @@ The same source code can be built both ways. Here's one way to do that.
 * Delete the script at the bottom of `index-jit.html` that loads `bundle.js`
 * Restore the SystemJS scripts like this:
 
-<code-example path="cb-aot-compiler/src/index-jit.html" region="jit" title="src/index-jit.html (SystemJS scripts)" linenums="false">
+<code-example path="aot-compiler/src/index-jit.html" region="jit" title="src/index-jit.html (SystemJS scripts)" linenums="false">
 </code-example>
 
 Notice the slight change to the `system.import` which now specifies `src/app/main-jit`.
@@ -603,6 +603,6 @@ showing exactly which application and Angular modules and classes are included i
 Here's the map for _Tour of Heroes_.
 <a href="assets/images/cookbooks/aot-compiler/toh6-bundle.png" target="_blank" title="View larger image">
   <figure class='image-display'>
-    <img src="assets/images/cookbooks/aot-compiler/toh6-bundle.png" alt="TOH-6-bundle"></img>
+    <img src="assets/images/cookbooks/aot-compiler/toh6-bundle.png" alt="toh-pt6-bundle"></img>
   </figure>
 </a>
diff --git a/aio/content/guide/architecture.md b/aio/content/guide/architecture.md
index 4faa5876e9..3207c57a15 100644
--- a/aio/content/guide/architecture.md
+++ b/aio/content/guide/architecture.md
@@ -743,7 +743,7 @@ publishing and subscribing to events.
 
 > [**Forms**](guide/forms): Support complex data entry scenarios with HTML-based validation and dirty checking.
 
-> [**HTTP**](guide/server-communication): Communicate with a server to get data, save data, and invoke server-side actions with an HTTP client.
+> [**HTTP**](guide/http): Communicate with a server to get data, save data, and invoke server-side actions with an HTTP client.
 
 > [**Lifecycle hooks**](guide/lifecycle-hooks): Tap into key moments in the lifetime of a component, from its creation to its destruction,
 by implementing the lifecycle hook interfaces.
diff --git a/aio/content/guide/browser-support.md b/aio/content/guide/browser-support.md
index 86751b47b2..30c1a626fb 100644
--- a/aio/content/guide/browser-support.md
+++ b/aio/content/guide/browser-support.md
@@ -389,7 +389,7 @@ Here are the features which may require additional polyfills:
   <tr style="vertical-align: top">
  
     <td>
-      <a href="./server-communication.html">Http</a>      <span> when sending and receiving binary data</span>
+      <a href="./http.html">Http</a>      <span> when sending and receiving binary data</span>
     </td>
 
     <td>
diff --git a/aio/content/guide/cb-index.md b/aio/content/guide/cb-index.md
deleted file mode 100644
index bc8518ca72..0000000000
--- a/aio/content/guide/cb-index.md
+++ /dev/null
@@ -1,43 +0,0 @@
-@title
-Cookbook
-
-@intro
-A collection of recipes for common Angular application scenarios.
-
-@description
-
-
-The *Cookbook* offers answers to common implementation questions.
-
-Each cookbook page is a collection of recipes focused on a particular Angular feature or application challenge
-such as data binding, cross-component interaction, and communicating with a remote server via HTTP.
-
-
-<div class="l-sub-section">
-
-
-
-The cookbook is just getting started. Many more recipes are on the way.
-
-
-</div>
-
-
-
-Each cookbook links to a live sample with every recipe included.
-
-Recipes are deliberately brief and code-centric.
-Each recipe links to a relevant page of the [Developer Guide](guide) or the
-[API Reference](api) where you can learn more about
-the purpose, context, and design choices behind the code snippets.
-
-## Feedback
-
-Post *documentation* requests and comments as
-<a href="https://github.com/angular/angular.io/issues" target="_blank" title="Documentation issues on github">
-<i>issues</i> on the angular.io</a> github repository.
-Fixes (small ones) are greatly appreciated as
-<a href="https://github.com/angular/angular.io/pulls" target="_blank" title="Documentation PRs on github">
-<i>pull requests</i></a>.
-
-Post issues with *Angular itself* to the [angular](https://github.com/angular/angular) github repository.
\ No newline at end of file
diff --git a/aio/content/guide/change-log.md b/aio/content/guide/change-log.md
index 3f44c0d9c1..9c4c20a852 100644
--- a/aio/content/guide/change-log.md
+++ b/aio/content/guide/change-log.md
@@ -75,7 +75,7 @@ Revised samples are clearer and cover all topics discussed.
 added (optional) instructions on how to remove _non-essential_ files. 
 * No longer consolidate RxJS operator imports in `rxjs-extensions` file; each file should import what it needs.
 * All samples prepend template/style URLs with `./` as a best practice.
-* [Style Guide](guide/style-guide): copy edits and revised rules.
+* [Style Guide](guide/styleguide): copy edits and revised rules.
 
 ## Router: more detail (2016-12-21)
 
@@ -85,7 +85,7 @@ including sections named outlets, wildcard routes, and preload strategies.
 ## HTTP: how to set default request headers (and other request options) (2016-12-14)
 
 Added section on how to set default request headers (and other request options) to 
-[HTTP](guide/server-communication#override-default-request-options) guide.
+[HTTP](guide/http#override-default-request-options) guide.
 
 ## Testing: added component test plunkers (2016-12-02)
 
@@ -205,7 +205,7 @@ The new "angular-in-memory-web-api" has new features.
 
 ## "Style Guide" with _NgModules_ (2016-09-27)
 
-[StyleGuide](guide/style-guide) explains recommended conventions for Angular modules (NgModule).
+[StyleGuide](guide/styleguide) explains recommended conventions for Angular modules (NgModule).
 Barrels now are far less useful and have been removed from the style guide;
 they remain valuable but are not a matter of Angular style.
 Also relaxed the rule that discouraged use of the `@Component.host` property.
diff --git a/aio/content/guide/cli-quickstart.md b/aio/content/guide/cli-quickstart.md
index b239758177..0b26fac9e7 100644
--- a/aio/content/guide/cli-quickstart.md
+++ b/aio/content/guide/cli-quickstart.md
@@ -13,7 +13,7 @@ as testing, bundling, and deployment.
 
 The goal in this guide is to build and run a simple Angular
 application in TypeScript, using the Angular CLI
-while adhering to the [Style Guide](guide/guide/style-guide) recommendations that
+while adhering to the [Style Guide](guide/guide/styleguide) recommendations that
 benefit _every_ Angular project.
 
 By the end of the chapter, you'll have a basic understanding of development with the CLI
diff --git a/aio/content/guide/component-communication.md b/aio/content/guide/component-communication.md
index 416b1f3a0f..9de8ac338d 100644
--- a/aio/content/guide/component-communication.md
+++ b/aio/content/guide/component-communication.md
@@ -21,7 +21,7 @@ in which two or more components share information.
 
 
 
-**See the <live-example name="cb-component-communication"></live-example>**.
+**See the <live-example name="component-communication"></live-example>**.
 
 {@a parent-to-child}
 
@@ -31,7 +31,7 @@ in which two or more components share information.
 typically adorned with [@Input decorations](guide/template-syntax#inputs-outputs).
 
 
-<code-example path="cb-component-communication/src/app/hero-child.component.ts" title="cb-component-communication/src/app/hero-child.component.ts">
+<code-example path="component-communication/src/app/hero-child.component.ts" title="component-communication/src/app/hero-child.component.ts">
 
 </code-example>
 
@@ -44,7 +44,7 @@ binding its `master` string property to the child's `master` alias,
 and each iteration's `hero` instance to the child's `hero` property.
 
 
-<code-example path="cb-component-communication/src/app/hero-parent.component.ts" title="cb-component-communication/src/app/hero-parent.component.ts">
+<code-example path="component-communication/src/app/hero-parent.component.ts" title="component-communication/src/app/hero-parent.component.ts">
 
 </code-example>
 
@@ -64,7 +64,7 @@ The running application displays three heroes:
 E2E test that all children were instantiated and displayed as expected:
 
 
-<code-example path="cb-component-communication/e2e-spec.ts" region="parent-to-child" title="cb-component-communication/e2e-spec.ts">
+<code-example path="component-communication/e2e-spec.ts" region="parent-to-child" title="component-communication/e2e-spec.ts">
 
 </code-example>
 
@@ -82,7 +82,7 @@ The setter of the `name` input property in the child `NameChildComponent`
 trims the whitespace from a name and replaces an empty value with default text.
 
 
-<code-example path="cb-component-communication/src/app/name-child.component.ts" title="cb-component-communication/src/app/name-child.component.ts">
+<code-example path="component-communication/src/app/name-child.component.ts" title="component-communication/src/app/name-child.component.ts">
 
 </code-example>
 
@@ -91,7 +91,7 @@ trims the whitespace from a name and replaces an empty value with default text.
 Here's the `NameParentComponent` demonstrating name variations including a name with all spaces:
 
 
-<code-example path="cb-component-communication/src/app/name-parent.component.ts" title="cb-component-communication/src/app/name-parent.component.ts">
+<code-example path="component-communication/src/app/name-parent.component.ts" title="component-communication/src/app/name-parent.component.ts">
 
 </code-example>
 
@@ -108,7 +108,7 @@ Here's the `NameParentComponent` demonstrating name variations including a name
 E2E tests of input property setter with empty and non-empty names:
 
 
-<code-example path="cb-component-communication/e2e-spec.ts" region="parent-to-child-setter" title="cb-component-communication/e2e-spec.ts">
+<code-example path="component-communication/e2e-spec.ts" region="parent-to-child-setter" title="component-communication/e2e-spec.ts">
 
 </code-example>
 
@@ -137,7 +137,7 @@ Learn about `ngOnChanges()` in the [LifeCycle Hooks](guide/lifecycle-hooks) chap
 This `VersionChildComponent` detects changes to the `major` and `minor` input properties and composes a log message reporting these changes:
 
 
-<code-example path="cb-component-communication/src/app/version-child.component.ts" title="cb-component-communication/src/app/version-child.component.ts">
+<code-example path="component-communication/src/app/version-child.component.ts" title="component-communication/src/app/version-child.component.ts">
 
 </code-example>
 
@@ -146,7 +146,7 @@ This `VersionChildComponent` detects changes to the `major` and `minor` input pr
 The `VersionParentComponent` supplies the `minor` and `major` values and binds buttons to methods that change them.
 
 
-<code-example path="cb-component-communication/src/app/version-parent.component.ts" title="cb-component-communication/src/app/version-parent.component.ts">
+<code-example path="component-communication/src/app/version-parent.component.ts" title="component-communication/src/app/version-parent.component.ts">
 
 </code-example>
 
@@ -167,7 +167,7 @@ Test that ***both*** input properties are set initially and that button clicks t
 the expected `ngOnChanges` calls and values:
 
 
-<code-example path="cb-component-communication/e2e-spec.ts" region="parent-to-child-onchanges" title="cb-component-communication/e2e-spec.ts">
+<code-example path="component-communication/e2e-spec.ts" region="parent-to-child-onchanges" title="component-communication/e2e-spec.ts">
 
 </code-example>
 
@@ -187,7 +187,7 @@ The child's `EventEmitter` property is an ***output property***,
   as seen in this `VoterComponent`:
 
 
-<code-example path="cb-component-communication/src/app/voter.component.ts" title="cb-component-communication/src/app/voter.component.ts">
+<code-example path="component-communication/src/app/voter.component.ts" title="component-communication/src/app/voter.component.ts">
 
 </code-example>
 
@@ -199,7 +199,7 @@ The parent `VoteTakerComponent` binds an event handler called `onVoted()` that r
 payload `$event` and updates a counter.
 
 
-<code-example path="cb-component-communication/src/app/votetaker.component.ts" title="cb-component-communication/src/app/votetaker.component.ts">
+<code-example path="component-communication/src/app/votetaker.component.ts" title="component-communication/src/app/votetaker.component.ts">
 
 </code-example>
 
@@ -220,7 +220,7 @@ and the method processes it:
 Test that clicking the *Agree* and *Disagree* buttons update the appropriate counters:
 
 
-<code-example path="cb-component-communication/e2e-spec.ts" region="child-to-parent" title="cb-component-communication/e2e-spec.ts">
+<code-example path="component-communication/e2e-spec.ts" region="child-to-parent" title="component-communication/e2e-spec.ts">
 
 </code-example>
 
@@ -243,7 +243,7 @@ The following is a child `CountdownTimerComponent` that repeatedly counts down t
 It has `start` and `stop` methods that control the clock and it displays a
 countdown status message in its own template.
 
-<code-example path="cb-component-communication/src/app/countdown-timer.component.ts" title="cb-component-communication/src/app/countdown-timer.component.ts">
+<code-example path="component-communication/src/app/countdown-timer.component.ts" title="component-communication/src/app/countdown-timer.component.ts">
 
 </code-example>
 
@@ -252,7 +252,7 @@ countdown status message in its own template.
 The `CountdownLocalVarParentComponent` that hosts the timer component is as follows:
 
 
-<code-example path="cb-component-communication/src/app/countdown-parent.component.ts" region="lv" title="cb-component-communication/src/app/countdown-parent.component.ts">
+<code-example path="component-communication/src/app/countdown-parent.component.ts" region="lv" title="component-communication/src/app/countdown-parent.component.ts">
 
 </code-example>
 
@@ -287,7 +287,7 @@ match the seconds displayed in the child's status message.
 Test also that clicking the *Stop* button pauses the countdown timer:
 
 
-<code-example path="cb-component-communication/e2e-spec.ts" region="countdown-timer-tests" title="cb-component-communication/e2e-spec.ts">
+<code-example path="component-communication/e2e-spec.ts" region="countdown-timer-tests" title="component-communication/e2e-spec.ts">
 
 </code-example>
 
@@ -327,7 +327,7 @@ is solely for the purpose of demonstration.
 
 Here is the parent, `CountdownViewChildParentComponent`:
 
-<code-example path="cb-component-communication/src/app/countdown-parent.component.ts" region="vc" title="cb-component-communication/src/app/countdown-parent.component.ts">
+<code-example path="component-communication/src/app/countdown-parent.component.ts" region="vc" title="component-communication/src/app/countdown-parent.component.ts">
 
 </code-example>
 
@@ -376,7 +376,7 @@ Components outside this component subtree have no access to the service or their
 This `MissionService` connects the `MissionControlComponent` to multiple `AstronautComponent` children.
 
 
-<code-example path="cb-component-communication/src/app/mission.service.ts" title="cb-component-communication/src/app/mission.service.ts">
+<code-example path="component-communication/src/app/mission.service.ts" title="component-communication/src/app/mission.service.ts">
 
 </code-example>
 
@@ -386,7 +386,7 @@ The `MissionControlComponent` both provides the instance of the service that it
 (through the `providers` metadata array) and injects that instance into itself through its constructor:
 
 
-<code-example path="cb-component-communication/src/app/missioncontrol.component.ts" title="cb-component-communication/src/app/missioncontrol.component.ts">
+<code-example path="component-communication/src/app/missioncontrol.component.ts" title="component-communication/src/app/missioncontrol.component.ts">
 
 </code-example>
 
@@ -396,7 +396,7 @@ The `AstronautComponent` also injects the service in its constructor.
 Each `AstronautComponent` is a child of the `MissionControlComponent` and therefore receives its parent's service instance:
 
 
-<code-example path="cb-component-communication/src/app/astronaut.component.ts" title="cb-component-communication/src/app/astronaut.component.ts">
+<code-example path="component-communication/src/app/astronaut.component.ts" title="component-communication/src/app/astronaut.component.ts">
 
 </code-example>
 
@@ -435,7 +435,7 @@ Tests click buttons of both the parent `MissionControlComponent` and the `Astron
 and verify that the history meets expectations:
 
 
-<code-example path="cb-component-communication/e2e-spec.ts" region="bidirectional-service" title="cb-component-communication/e2e-spec.ts">
+<code-example path="component-communication/e2e-spec.ts" region="bidirectional-service" title="component-communication/e2e-spec.ts">
 
 </code-example>
 
diff --git a/aio/content/guide/cb-dependency-injection.md b/aio/content/guide/dependency-injection-in-action.md
similarity index 71%
rename from aio/content/guide/cb-dependency-injection.md
rename to aio/content/guide/dependency-injection-in-action.md
index 3c4bf12742..dfe12a27ad 100644
--- a/aio/content/guide/cb-dependency-injection.md
+++ b/aio/content/guide/dependency-injection-in-action.md
@@ -13,47 +13,47 @@ This cookbook explores many of the features of Dependency Injection (DI) in Angu
 
 # Contents
 
-* [Application-wide dependencies](guide/cb-dependency-injection#app-wide-dependencies)
-* [External module configuration](guide/cb-dependency-injection#external-module-configuration)
-* [`@Injectable()` and nested service dependencies](guide/cb-dependency-injection#nested-dependencies)
+* [Application-wide dependencies](guide/dependency-injection-in-action#app-wide-dependencies)
+* [External module configuration](guide/dependency-injection-in-action#external-module-configuration)
+* [`@Injectable()` and nested service dependencies](guide/dependency-injection-in-action#nested-dependencies)
 
-  * [`@Injectable()`](guide/cb-dependency-injection#injectable-1)
+  * [`@Injectable()`](guide/dependency-injection-in-action#injectable-1)
 
-* [Limit service scope to a component subtree](guide/cb-dependency-injection#service-scope)
-* [Multiple service instances (sandboxing)](guide/cb-dependency-injection#multiple-service-instances)
-* [Qualify dependency lookup with `@Optional()` and `@Host()`](guide/cb-dependency-injection#qualify-dependency-lookup)
+* [Limit service scope to a component subtree](guide/dependency-injection-in-action#service-scope)
+* [Multiple service instances (sandboxing)](guide/dependency-injection-in-action#multiple-service-instances)
+* [Qualify dependency lookup with `@Optional()` and `@Host()`](guide/dependency-injection-in-action#qualify-dependency-lookup)
 
-  * [Demonstration](guide/cb-dependency-injection#demonstration)
+  * [Demonstration](guide/dependency-injection-in-action#demonstration)
 
-* [Inject the component's DOM element](guide/cb-dependency-injection#component-element)
-* [Define dependencies with providers](guide/cb-dependency-injection#providers)
+* [Inject the component's DOM element](guide/dependency-injection-in-action#component-element)
+* [Define dependencies with providers](guide/dependency-injection-in-action#providers)
 
-  * [Defining providers](guide/cb-dependency-injection#defining-providers)
-  * [The *provide* object literal](guide/cb-dependency-injection#provide)
-  * [`useValue`&mdash;the *value provider*](guide/cb-dependency-injection#usevalue)
-  * [`useClass`&mdash;the *class provider*](guide/cb-dependency-injection#useclass)
-  * [`useExisting`&mdash;the *alias provider*](guide/cb-dependency-injection#useexisting)
-  * [`useFactory`&mdash;the *factory provider*](guide/cb-dependency-injection#usefactory)
+  * [Defining providers](guide/dependency-injection-in-action#defining-providers)
+  * [The *provide* object literal](guide/dependency-injection-in-action#provide)
+  * [`useValue`&mdash;the *value provider*](guide/dependency-injection-in-action#usevalue)
+  * [`useClass`&mdash;the *class provider*](guide/dependency-injection-in-action#useclass)
+  * [`useExisting`&mdash;the *alias provider*](guide/dependency-injection-in-action#useexisting)
+  * [`useFactory`&mdash;the *factory provider*](guide/dependency-injection-in-action#usefactory)
 
-* [Provider token alternatives: the class-interface and `InjectionToken`](guide/cb-dependency-injection#tokens)
+* [Provider token alternatives: the class-interface and `InjectionToken`](guide/dependency-injection-in-action#tokens)
 
-  * [class-interface](guide/cb-dependency-injection#class-interface)
-  * [`InjectionToken`](guide/cb-dependency-injection#injection-token)
+  * [class-interface](guide/dependency-injection-in-action#class-interface)
+  * [`InjectionToken`](guide/dependency-injection-in-action#injection-token)
 
-* [Inject into a derived class](guide/cb-dependency-injection#di-inheritance)
-* [Find a parent component by injection](guide/cb-dependency-injection#find-parent)
+* [Inject into a derived class](guide/dependency-injection-in-action#di-inheritance)
+* [Find a parent component by injection](guide/dependency-injection-in-action#find-parent)
 
-  * [Find parent with a known component type](guide/cb-dependency-injection#known-parent)
-  * [Cannot find a parent by its base class](guide/cb-dependency-injection#base-parent)
-  * [Find a parent by its class-interface](guide/cb-dependency-injection#class-interface-parent)
-  * [Find a parent in a tree of parents with `@SkipSelf()`](guide/cb-dependency-injection#parent-tree)
-  * [The `Parent` class-interface](guide/cb-dependency-injection#parent-token)
-  * [A `provideParent()` helper function](guide/cb-dependency-injection#provideparent)
+  * [Find parent with a known component type](guide/dependency-injection-in-action#known-parent)
+  * [Cannot find a parent by its base class](guide/dependency-injection-in-action#base-parent)
+  * [Find a parent by its class-interface](guide/dependency-injection-in-action#class-interface-parent)
+  * [Find a parent in a tree of parents with `@SkipSelf()`](guide/dependency-injection-in-action#parent-tree)
+  * [The `Parent` class-interface](guide/dependency-injection-in-action#parent-token)
+  * [A `provideParent()` helper function](guide/dependency-injection-in-action#provideparent)
 
-* [Break circularities with a forward class reference (*forwardRef*)](guide/cb-dependency-injection#forwardref)
+* [Break circularities with a forward class reference (*forwardRef*)](guide/dependency-injection-in-action#forwardref)
 
 
-See the <live-example name="cb-dependency-injection"></live-example>
+See the <live-example name="dependency-injection-in-action"></live-example>
 of the code in this cookbook.
 
 {@a app-wide-dependencies}
@@ -66,7 +66,7 @@ the `LoggerService`, `UserContext`, and the `UserService`
 in the `@Component` metadata `providers` array.
 
 
-<code-example path="cb-dependency-injection/src/app/app.component.ts" region="import-services" title="src/app/app.component.ts (excerpt)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/app.component.ts" region="import-services" title="src/app/app.component.ts (excerpt)" linenums="false">
 
 </code-example>
 
@@ -92,13 +92,13 @@ guide.
 Now that you've registered these services,
 Angular can inject them into the constructor of *any* component or service, *anywhere* in the application.
 
-<code-example path="cb-dependency-injection/src/app/hero-bios.component.ts" region="ctor" title="src/app/hero-bios.component.ts (component constructor injection)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/hero-bios.component.ts" region="ctor" title="src/app/hero-bios.component.ts (component constructor injection)" linenums="false">
 
 </code-example>
 
 
 
-<code-example path="cb-dependency-injection/src/app/user-context.service.ts" region="ctor" title="src/app/user-context.service.ts (service constructor injection)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/user-context.service.ts" region="ctor" title="src/app/user-context.service.ts (service constructor injection)" linenums="false">
 
 </code-example>
 
@@ -116,7 +116,7 @@ Here is an example of the second case, where the component router configuration
 in the `providers` list of the `AppModule`.
 
 
-<code-example path="cb-dependency-injection/src/app/app.module.ts" region="providers" title="src/app/app.module.ts (providers)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/app.module.ts" region="providers" title="src/app/app.module.ts (providers)" linenums="false">
 
 </code-example>
 
@@ -141,7 +141,7 @@ constructor and the framework takes over.
 
 The following example shows injecting both the `LoggerService` and the `UserContext` in the `AppComponent`.
 
-<code-example path="cb-dependency-injection/src/app/app.component.ts" region="ctor" title="src/app/app.component.ts" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/app.component.ts" region="ctor" title="src/app/app.component.ts" linenums="false">
 
 </code-example>
 
@@ -151,7 +151,7 @@ The `UserContext` in turn has its own dependencies on both the `LoggerService` a
 a `UserService` that gathers information about a particular user.
 
 
-<code-example path="cb-dependency-injection/src/app/user-context.service.ts" region="injectables" title="user-context.service.ts (injection)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/user-context.service.ts" region="injectables" title="user-context.service.ts (injection)" linenums="false">
 
 </code-example>
 
@@ -182,7 +182,7 @@ Once all the dependencies are in place, the `AppComponent` displays the user inf
 ### *@Injectable()*
 Notice the `@Injectable()`decorator on the `UserContextService` class.
 
-<code-example path="cb-dependency-injection/src/app/user-context.service.ts" region="injectable" title="user-context.service.ts (@Injectable)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/user-context.service.ts" region="injectable" title="user-context.service.ts (@Injectable)" linenums="false">
 
 </code-example>
 
@@ -249,7 +249,7 @@ This example shows how similar providing a service to a sub-root component is
 to providing a service in the root `AppComponent`. The syntax is the same.
 Here, the `HeroService` is availble to the `HeroesBaseComponent` because it is in the `providers` array:
 
-<code-example path="cb-dependency-injection/src/app/sorted-heroes.component.ts" region="injection" title="src/app/sorted-heroes.component.ts (HeroesBaseComponent excerpt)">
+<code-example path="dependency-injection-in-action/src/app/sorted-heroes.component.ts" region="injection" title="src/app/sorted-heroes.component.ts (HeroesBaseComponent excerpt)">
 
 </code-example>
 
@@ -301,7 +301,7 @@ This is called *sandboxing* because each service and component instance has its
 {@a hero-bios-component}
 Imagine a `HeroBiosComponent` that presents three instances of the `HeroBioComponent`.
 
-<code-example path="cb-dependency-injection/src/app/hero-bios.component.ts" region="simple" title="ap/hero-bios.component.ts">
+<code-example path="dependency-injection-in-action/src/app/hero-bios.component.ts" region="simple" title="ap/hero-bios.component.ts">
 
 </code-example>
 
@@ -310,7 +310,7 @@ Imagine a `HeroBiosComponent` that presents three instances of the `HeroBioCompo
 Each `HeroBioComponent` can edit a single hero's biography.
 A `HeroBioComponent` relies on a `HeroCacheService` to fetch, cache, and perform other persistence operations on that hero.
 
-<code-example path="cb-dependency-injection/src/app/hero-cache.service.ts" region="service" title="src/app/hero-cache.service.ts">
+<code-example path="dependency-injection-in-action/src/app/hero-cache.service.ts" region="service" title="src/app/hero-cache.service.ts">
 
 </code-example>
 
@@ -322,7 +322,7 @@ They'd be competing with each other to determine which hero to cache.
 Each `HeroBioComponent` gets its *own* `HeroCacheService` instance
 by listing the `HeroCacheService` in its metadata `providers` array.
 
-<code-example path="cb-dependency-injection/src/app/hero-bio.component.ts" region="component" title="src/app/hero-bio.component.ts">
+<code-example path="dependency-injection-in-action/src/app/hero-bio.component.ts" region="component" title="src/app/hero-bio.component.ts">
 
 </code-example>
 
@@ -333,7 +333,7 @@ The `ngOnInit` passes that `id` to the service, which fetches and caches the her
 The getter for the `hero` property pulls the cached hero from the service.
 And the template displays this data-bound property.
 
-Find this example in <live-example name="cb-dependency-injection">live code</live-example>
+Find this example in <live-example name="dependency-injection-in-action">live code</live-example>
 and confirm that the three `HeroBioComponent` instances have their own cached hero data.
 
 <figure class='image-display'>
@@ -374,9 +374,9 @@ The next example covers this second case.
 
 
 ### Demonstration
-The `HeroBiosAndContactsComponent` is a revision of the `HeroBiosComponent` that you looked at [above](guide/cb-dependency-injection#hero-bios-component).
+The `HeroBiosAndContactsComponent` is a revision of the `HeroBiosComponent` that you looked at [above](guide/dependency-injection-in-action#hero-bios-component).
 
-<code-example path="cb-dependency-injection/src/app/hero-bios.component.ts" region="hero-bios-and-contacts" title="src/app/hero-bios.component.ts (HeroBiosAndContactsComponent)">
+<code-example path="dependency-injection-in-action/src/app/hero-bios.component.ts" region="hero-bios-and-contacts" title="src/app/hero-bios.component.ts (HeroBiosAndContactsComponent)">
 
 </code-example>
 
@@ -384,7 +384,7 @@ The `HeroBiosAndContactsComponent` is a revision of the `HeroBiosComponent` that
 
 Focus on the template:
 
-<code-example path="cb-dependency-injection/src/app/hero-bios.component.ts" region="template" title="cb-dependency-injection/src/app/hero-bios.component.ts" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/hero-bios.component.ts" region="template" title="dependency-injection-in-action/src/app/hero-bios.component.ts" linenums="false">
 
 </code-example>
 
@@ -394,7 +394,7 @@ Now there is a new `<hero-contact>` element between the `<hero-bio>` tags.
 Angular *projects*, or *transcludes*, the corresponding `HeroContactComponent` into the `HeroBioComponent` view,
 placing it in the `<ng-content>` slot of the `HeroBioComponent` template:
 
-<code-example path="cb-dependency-injection/src/app/hero-bio.component.ts" region="template" title="src/app/hero-bio.component.ts (template)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/hero-bio.component.ts" region="template" title="src/app/hero-bio.component.ts (template)" linenums="false">
 
 </code-example>
 
@@ -410,7 +410,7 @@ It looks like this, with the hero's telephone number from `HeroContactComponent`
 
 Here's the `HeroContactComponent` which demonstrates the qualifying decorators:
 
-<code-example path="cb-dependency-injection/src/app/hero-contact.component.ts" region="component" title="src/app/hero-contact.component.ts">
+<code-example path="dependency-injection-in-action/src/app/hero-contact.component.ts" region="component" title="src/app/hero-contact.component.ts">
 
 </code-example>
 
@@ -418,7 +418,7 @@ Here's the `HeroContactComponent` which demonstrates the qualifying decorators:
 
 Focus on the constructor parameters:
 
-<code-example path="cb-dependency-injection/src/app/hero-contact.component.ts" region="ctor-params" title="src/app/hero-contact.component.ts" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/hero-contact.component.ts" region="ctor-params" title="src/app/hero-contact.component.ts" linenums="false">
 
 </code-example>
 
@@ -470,7 +470,7 @@ require DOM access.
 To illustrate, here's a simplified version of the `HighlightDirective` from
 the [Attribute Directives](guide/attribute-directives) page.
 
-<code-example path="cb-dependency-injection/src/app/highlight.directive.ts" title="src/app/highlight.directive.ts">
+<code-example path="dependency-injection-in-action/src/app/highlight.directive.ts" title="src/app/highlight.directive.ts">
 
 </code-example>
 
@@ -486,7 +486,7 @@ Its `nativeElement` property exposes the DOM element for the directive to manipu
 The sample code applies the directive's `myHighlight` attribute to two `<div>` tags,
 first without a value (yielding the default color) and then with an assigned color value.
 
-<code-example path="cb-dependency-injection/src/app/app.component.html" region="highlight" title="src/app/app.component.html (highlight)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/app.component.html" region="highlight" title="src/app/app.component.html (highlight)" linenums="false">
 
 </code-example>
 
@@ -513,7 +513,7 @@ Angular passes this token to the injector and assigns the result to the paramete
 Here's a typical example:
 
 
-<code-example path="cb-dependency-injection/src/app/hero-bios.component.ts" region="ctor" title="src/app/hero-bios.component.ts (component constructor injection)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/hero-bios.component.ts" region="ctor" title="src/app/hero-bios.component.ts (component constructor injection)" linenums="false">
 
 </code-example>
 
@@ -533,7 +533,7 @@ A *provider* is a recipe for delivering a service associated with a *token*.
 
 If the injector doesn't have a provider for the requested *token*, it delegates the request
 to its parent injector, where the process repeats until there are no more injectors.
-If the search is futile, the injector throws an error&mdash;unless the request was [optional](guide/cb-dependency-injection#optional).
+If the search is futile, the injector throws an error&mdash;unless the request was [optional](guide/dependency-injection-in-action#optional).
 
 
 </div>
@@ -545,7 +545,7 @@ Angular initializes the injectors it creates with some providers it cares about.
 You have to register your _own_ application providers manually,
 usually in the `providers` array of the `Component` or `Directive` metadata:
 
-<code-example path="cb-dependency-injection/src/app/app.component.ts" region="providers" title="src/app/app.component.ts (providers)">
+<code-example path="dependency-injection-in-action/src/app/app.component.ts" region="providers" title="src/app/app.component.ts (providers)">
 
 </code-example>
 
@@ -559,7 +559,7 @@ usually in the `providers` array of the `Component` or `Directive` metadata:
 The simple class provider is the most typical by far.
 You mention the class in the `providers` array and you're done.
 
-<code-example path="cb-dependency-injection/src/app/hero-bios.component.ts" region="class-provider" title="src/app/hero-bios.component.ts (class provider)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/hero-bios.component.ts" region="class-provider" title="src/app/hero-bios.component.ts (class provider)" linenums="false">
 
 </code-example>
 
@@ -580,7 +580,7 @@ It's visually simple: a few properties and the logs produced by a logger.
 
 The code behind it gives you plenty to think about.
 
-<code-example path="cb-dependency-injection/src/app/hero-of-the-month.component.ts" region="hero-of-the-month" title="hero-of-the-month.component.ts">
+<code-example path="dependency-injection-in-action/src/app/hero-of-the-month.component.ts" region="hero-of-the-month" title="hero-of-the-month.component.ts">
 
 </code-example>
 
@@ -593,7 +593,7 @@ The code behind it gives you plenty to think about.
 #### The *provide* object literal
 
 The `provide` object literal takes a *token* and a *definition object*.
-The *token* is usually a class but [it doesn't have to be](guide/cb-dependency-injection#tokens).
+The *token* is usually a class but [it doesn't have to be](guide/dependency-injection-in-action#tokens).
 
 The *definition* object has a required property that specifies how to create the singleton instance of the service. In this case, the property. 
 
@@ -613,7 +613,7 @@ The `HeroOfTheMonthComponent` example has two *value providers*.
 The first provides an instance of the `Hero` class;
 the second specifies a literal string resource:
 
-<code-example path="cb-dependency-injection/src/app/hero-of-the-month.component.ts" region="use-value" title="cb-dependency-injection/src/app/hero-of-the-month.component.ts" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/hero-of-the-month.component.ts" region="use-value" title="dependency-injection-in-action/src/app/hero-of-the-month.component.ts" linenums="false">
 
 </code-example>
 
@@ -623,7 +623,7 @@ The `Hero` provider token is a class which makes sense because the value is a `H
 and the consumer of the injected hero would want the type information.
 
 The `TITLE` provider token is *not a class*.
-It's a special kind of provider lookup key called an [InjectionToken](guide/cb-dependency-injection#injection-token).
+It's a special kind of provider lookup key called an [InjectionToken](guide/dependency-injection-in-action#injection-token).
 You can use an `InjectionToken` for any kind of provider but it's particular
 helpful when the dependency is a simple value like a string, a number, or a function.
 
@@ -631,7 +631,7 @@ The value of a *value provider* must be defined *now*. You can't create the valu
 Obviously the title string literal is immediately available.
 The `someHero` variable in this example was set earlier in the file:
 
-<code-example path="cb-dependency-injection/src/app/hero-of-the-month.component.ts" region="some-hero" title="cb-dependency-injection/src/app/hero-of-the-month.component.ts">
+<code-example path="dependency-injection-in-action/src/app/hero-of-the-month.component.ts" region="some-hero" title="dependency-injection-in-action/src/app/hero-of-the-month.component.ts">
 
 </code-example>
 
@@ -654,7 +654,7 @@ or fake the behavior of the real class in a test case.
 
 Here are two examples in the `HeroOfTheMonthComponent`:
 
-<code-example path="cb-dependency-injection/src/app/hero-of-the-month.component.ts" region="use-class" title="cb-dependency-injection/src/app/hero-of-the-month.component.ts" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/hero-of-the-month.component.ts" region="use-class" title="dependency-injection-in-action/src/app/hero-of-the-month.component.ts" linenums="false">
 
 </code-example>
 
@@ -681,7 +681,7 @@ Components outside the tree continue to receive the original `LoggerService` ins
 
 The `DateLoggerService` inherits from `LoggerService`; it appends the current date/time to each message:
 
-<code-example path="cb-dependency-injection/src/app/date-logger.service.ts" region="date-logger-service" title="src/app/date-logger.service.ts" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/date-logger.service.ts" region="date-logger-service" title="src/app/date-logger.service.ts" linenums="false">
 
 </code-example>
 
@@ -697,7 +697,7 @@ The `useExisting` provider maps one token to another.
 In effect, the first token is an ***alias*** for the service associated with the second token,
 creating ***two ways to access the same service object***.
 
-<code-example path="cb-dependency-injection/src/app/hero-of-the-month.component.ts" region="use-existing" title="cb-dependency-injection/src/app/hero-of-the-month.component.ts">
+<code-example path="dependency-injection-in-action/src/app/hero-of-the-month.component.ts" region="use-existing" title="dependency-injection-in-action/src/app/hero-of-the-month.component.ts">
 
 </code-example>
 
@@ -708,10 +708,10 @@ The following example shows aliasing for that purpose.
 
 Imagine that the `LoggerService` had a large API, much larger than the actual three methods and a property.
 You might want to shrink that API surface to just the members you actually need.
-Here the `MinimalLogger` [*class-interface*](guide/cb-dependency-injection#class-interface) reduces the API to two members:
+Here the `MinimalLogger` [*class-interface*](guide/dependency-injection-in-action#class-interface) reduces the API to two members:
 
 
-<code-example path="cb-dependency-injection/src/app/minimal-logger.service.ts" title="src/app/minimal-logger.service.ts" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/minimal-logger.service.ts" title="src/app/minimal-logger.service.ts" linenums="false">
 
 </code-example>
 
@@ -719,7 +719,7 @@ Here the `MinimalLogger` [*class-interface*](guide/cb-dependency-injection#class
 
 Now put it to use in a simplified version of the `HeroOfTheMonthComponent`.
 
-<code-example path="cb-dependency-injection/src/app/hero-of-the-month.component.1.ts" title="src/app/hero-of-the-month.component.ts (minimal version)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/hero-of-the-month.component.1.ts" title="src/app/hero-of-the-month.component.ts (minimal version)" linenums="false">
 
 </code-example>
 
@@ -733,7 +733,7 @@ The `HeroOfTheMonthComponent` constructor's `logger` parameter is typed as `Mini
 
 
 
-Behind the scenes, Angular actually sets the `logger` parameter to the full service registered under the `LoggingService` token which happens to be the `DateLoggerService` that was [provided above](guide/cb-dependency-injection#useclass).
+Behind the scenes, Angular actually sets the `logger` parameter to the full service registered under the `LoggingService` token which happens to be the `DateLoggerService` that was [provided above](guide/dependency-injection-in-action#useclass).
 
 
 <div class="l-sub-section">
@@ -761,7 +761,7 @@ The following image, which displays the logging date, confirms the point:
 The `useFactory` provider creates a dependency object by calling a factory function
 as in this example.
 
-<code-example path="cb-dependency-injection/src/app/hero-of-the-month.component.ts" region="use-factory" title="cb-dependency-injection/src/app/hero-of-the-month.component.ts">
+<code-example path="dependency-injection-in-action/src/app/hero-of-the-month.component.ts" region="use-factory" title="dependency-injection-in-action/src/app/hero-of-the-month.component.ts">
 
 </code-example>
 
@@ -781,7 +781,7 @@ The `runnersUpFactory` itself isn't the provider factory function.
 The true provider factory function is the function that `runnersUpFactory` returns.
 
 
-<code-example path="cb-dependency-injection/src/app/runners-up.ts" region="factory-synopsis" title="runners-up.ts (excerpt)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/runners-up.ts" region="factory-synopsis" title="runners-up.ts (excerpt)" linenums="false">
 
 </code-example>
 
@@ -804,7 +804,7 @@ and Angular injects it into the `runnersUp` parameter of the `HeroOfTheMonthComp
 
 The function retrieves candidate heroes from the `HeroService`,
 takes `2` of them to be the runners-up, and returns their concatenated names.
-Look at the <live-example name="cb-dependency-injection"></live-example>
+Look at the <live-example name="dependency-injection-in-action"></live-example>
 for the full source code.
 
 
@@ -830,7 +830,7 @@ That's the subject of the next section.
 The previous *Hero of the Month* example used the `MinimalLogger` class
 as the token for a provider of a `LoggerService`.
 
-<code-example path="cb-dependency-injection/src/app/hero-of-the-month.component.ts" region="use-existing" title="cb-dependency-injection/src/app/hero-of-the-month.component.ts">
+<code-example path="dependency-injection-in-action/src/app/hero-of-the-month.component.ts" region="use-existing" title="dependency-injection-in-action/src/app/hero-of-the-month.component.ts">
 
 </code-example>
 
@@ -838,7 +838,7 @@ as the token for a provider of a `LoggerService`.
 
 The `MinimalLogger` is an abstract class.
 
-<code-example path="cb-dependency-injection/src/app/minimal-logger.service.ts" title="cb-dependency-injection/src/app/minimal-logger.service.ts" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/minimal-logger.service.ts" title="dependency-injection-in-action/src/app/minimal-logger.service.ts" linenums="false">
 
 </code-example>
 
@@ -878,7 +878,7 @@ Using a class as an interface gives you the characteristics of an interface in a
 Of course a real object occupies memory. To minimize memory cost, the class should have *no implementation*.
 The `MinimalLogger` transpiles to this unoptimized, pre-minified JavaScript for a constructor function:
 
-<code-example path="cb-dependency-injection/src/app/minimal-logger.service.ts" region="minimal-logger-transpiled" title="cb-dependency-injection/src/app/minimal-logger.service.ts" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/minimal-logger.service.ts" region="minimal-logger-transpiled" title="dependency-injection-in-action/src/app/minimal-logger.service.ts" linenums="false">
 
 </code-example>
 
@@ -908,7 +908,7 @@ The `InjectionToken` has these characteristics.
 You encountered them twice in the *Hero of the Month* example,
 in the *title* value provider and in the *runnersUp* factory provider.
 
-<code-example path="cb-dependency-injection/src/app/hero-of-the-month.component.ts" region="provide-injection-token" title="cb-dependency-injection/src/app/hero-of-the-month.component.ts" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/hero-of-the-month.component.ts" region="provide-injection-token" title="dependency-injection-in-action/src/app/hero-of-the-month.component.ts" linenums="false">
 
 </code-example>
 
@@ -916,7 +916,7 @@ in the *title* value provider and in the *runnersUp* factory provider.
 
 You created the `TITLE` token like this:
 
-<code-example path="cb-dependency-injection/src/app/hero-of-the-month.component.ts" region="injection-token" title="cb-dependency-injection/src/app/hero-of-the-month.component.ts" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/hero-of-the-month.component.ts" region="injection-token" title="dependency-injection-in-action/src/app/hero-of-the-month.component.ts" linenums="false">
 
 </code-example>
 
@@ -951,7 +951,7 @@ It demands its own instance of the `HeroService` to get heroes
 and displays them in the order they arrive from the database.
 
 
-<code-example path="cb-dependency-injection/src/app/sorted-heroes.component.ts" region="heroes-base" title="src/app/sorted-heroes.component.ts (HeroesBaseComponent)">
+<code-example path="dependency-injection-in-action/src/app/sorted-heroes.component.ts" region="heroes-base" title="src/app/sorted-heroes.component.ts (HeroesBaseComponent)">
 
 </code-example>
 
@@ -980,7 +980,7 @@ You must provide the `HeroService` again for *this* component,
 then pass it down to the base class inside the constructor.
 
 
-<code-example path="cb-dependency-injection/src/app/sorted-heroes.component.ts" region="sorted-heroes" title="src/app/sorted-heroes.component.ts (SortedHeroesComponent)">
+<code-example path="dependency-injection-in-action/src/app/sorted-heroes.component.ts" region="sorted-heroes" title="src/app/sorted-heroes.component.ts (SortedHeroesComponent)">
 
 </code-example>
 
@@ -1035,7 +1035,7 @@ In the following example, the parent `AlexComponent` has several children includ
 {@a alex}
 
 
-<code-example path="cb-dependency-injection/src/app/parent-finder.component.ts" region="alex-1" title="parent-finder.component.ts (AlexComponent v.1)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="alex-1" title="parent-finder.component.ts (AlexComponent v.1)" linenums="false">
 
 </code-example>
 
@@ -1044,15 +1044,15 @@ In the following example, the parent `AlexComponent` has several children includ
 *Cathy* reports whether or not she has access to *Alex*
 after injecting an `AlexComponent` into her constructor:
 
-<code-example path="cb-dependency-injection/src/app/parent-finder.component.ts" region="cathy" title="parent-finder.component.ts (CathyComponent)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="cathy" title="parent-finder.component.ts (CathyComponent)" linenums="false">
 
 </code-example>
 
 
 
-Notice that even though the [@Optional](guide/cb-dependency-injection#optional) qualifier 
+Notice that even though the [@Optional](guide/dependency-injection-in-action#optional) qualifier 
 is there for safety,
-the <live-example name="cb-dependency-injection"></live-example>
+the <live-example name="dependency-injection-in-action"></live-example>
 confirms that the `alex` parameter is set.
 
 
@@ -1090,10 +1090,10 @@ This isn't necessarily good design.
 This example is examining *whether a component can 
 inject its parent via the parent's base class*.
 
-The sample's `CraigComponent` explores this question. [Looking back](guide/cb-dependency-injection#alex),
+The sample's `CraigComponent` explores this question. [Looking back](guide/dependency-injection-in-action#alex),
 you see that the `Alex` component *extends* (*inherits*) from a class named `Base`.
 
-<code-example path="cb-dependency-injection/src/app/parent-finder.component.ts" region="alex-class-signature" title="parent-finder.component.ts (Alex class signature)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="alex-class-signature" title="parent-finder.component.ts (Alex class signature)" linenums="false">
 
 </code-example>
 
@@ -1101,14 +1101,14 @@ you see that the `Alex` component *extends* (*inherits*) from a class named `Bas
 
 The `CraigComponent` tries to inject `Base` into its `alex` constructor parameter and reports if it succeeded.
 
-<code-example path="cb-dependency-injection/src/app/parent-finder.component.ts" region="craig" title="parent-finder.component.ts (CraigComponent)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="craig" title="parent-finder.component.ts (CraigComponent)" linenums="false">
 
 </code-example>
 
 
 
 Unfortunately, this does not work.
-The <live-example name="cb-dependency-injection"></live-example>
+The <live-example name="dependency-injection-in-action"></live-example>
 confirms that the `alex` parameter is null.
 *You cannot inject a parent by its base class.*
 
@@ -1119,33 +1119,33 @@ confirms that the `alex` parameter is null.
 
 ### Find a parent by its class-interface
 
-You can find a parent component with a [class-interface](guide/cb-dependency-injection#class-interface).
+You can find a parent component with a [class-interface](guide/dependency-injection-in-action#class-interface).
 
 The parent must cooperate by providing an *alias* to itself in the name of a *class-interface* token.
 
 Recall that Angular always adds a component instance to its own injector;
-that's why you could inject *Alex* into *Cathy* [earlier](guide/cb-dependency-injection#known-parent).
+that's why you could inject *Alex* into *Cathy* [earlier](guide/dependency-injection-in-action#known-parent).
 
-Write an [*alias provider*](guide/cb-dependency-injection#useexisting)&mdash;a `provide` object literal with a `useExisting` 
+Write an [*alias provider*](guide/dependency-injection-in-action#useexisting)&mdash;a `provide` object literal with a `useExisting` 
 definition&mdash;that creates an *alternative* way to inject the same component instance
 and add that provider to the `providers` array of the `@Component` metadata for the `AlexComponent`:
 
 {@a alex-providers}
 
 
-<code-example path="cb-dependency-injection/src/app/parent-finder.component.ts" region="alex-providers" title="parent-finder.component.ts (AlexComponent providers)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="alex-providers" title="parent-finder.component.ts (AlexComponent providers)" linenums="false">
 
 </code-example>
 
 
 
-[Parent](guide/cb-dependency-injection#parent-token) is the provider's *class-interface* token.
-The [*forwardRef*](guide/cb-dependency-injection#forwardref) breaks the circular reference you just created by having the `AlexComponent` refer to itself.
+[Parent](guide/dependency-injection-in-action#parent-token) is the provider's *class-interface* token.
+The [*forwardRef*](guide/dependency-injection-in-action#forwardref) breaks the circular reference you just created by having the `AlexComponent` refer to itself.
 
 *Carol*, the third of *Alex*'s child components, injects the parent into its `parent` parameter, 
 the same way you've done it before:
 
-<code-example path="cb-dependency-injection/src/app/parent-finder.component.ts" region="carol-class" title="parent-finder.component.ts (CarolComponent class)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="carol-class" title="parent-finder.component.ts (CarolComponent class)" linenums="false">
 
 </code-example>
 
@@ -1173,24 +1173,24 @@ That means he must both *inject* the `Parent` *class-interface* to get *Alice* a
 
 Here's *Barry*:
 
-<code-example path="cb-dependency-injection/src/app/parent-finder.component.ts" region="barry" title="parent-finder.component.ts (BarryComponent)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="barry" title="parent-finder.component.ts (BarryComponent)" linenums="false">
 
 </code-example>
 
 
 
-*Barry*'s `providers` array looks just like [*Alex*'s](guide/cb-dependency-injection#alex-providers).
-If you're going to keep writing [*alias providers*](guide/cb-dependency-injection#useexisting) like this you should create a [helper function](guide/cb-dependency-injection#provideparent).
+*Barry*'s `providers` array looks just like [*Alex*'s](guide/dependency-injection-in-action#alex-providers).
+If you're going to keep writing [*alias providers*](guide/dependency-injection-in-action#useexisting) like this you should create a [helper function](guide/dependency-injection-in-action#provideparent).
 
 For now, focus on *Barry*'s constructor:
 
 <code-tabs>
 
-  <code-pane title="Barry's constructor" path="cb-dependency-injection/src/app/parent-finder.component.ts" region="barry-ctor">
+  <code-pane title="Barry's constructor" path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="barry-ctor">
 
   </code-pane>
 
-  <code-pane title="Carol's constructor" path="cb-dependency-injection/src/app/parent-finder.component.ts" region="carol-ctor">
+  <code-pane title="Carol's constructor" path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="carol-ctor">
 
   </code-pane>
 
@@ -1224,11 +1224,11 @@ Here's *Alice*, *Barry* and family in action:
 
 
 ### The *Parent* class-interface
-You [learned earlier](guide/cb-dependency-injection#class-interface) that a *class-interface* is an abstract class used as an interface rather than as a base class.
+You [learned earlier](guide/dependency-injection-in-action#class-interface) that a *class-interface* is an abstract class used as an interface rather than as a base class.
 
 The example defines a `Parent` *class-interface*.
 
-<code-example path="cb-dependency-injection/src/app/parent-finder.component.ts" region="parent" title="parent-finder.component.ts (Parent class-interface)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="parent" title="parent-finder.component.ts (Parent class-interface)" linenums="false">
 
 </code-example>
 
@@ -1240,7 +1240,7 @@ Such a narrow interface helps decouple the child component class from its parent
 
 A component that could serve as a parent *should* implement the *class-interface* as the `AliceComponent` does:
 
-<code-example path="cb-dependency-injection/src/app/parent-finder.component.ts" region="alice-class-signature" title="parent-finder.component.ts (AliceComponent class signature)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="alice-class-signature" title="parent-finder.component.ts (AliceComponent class signature)" linenums="false">
 
 </code-example>
 
@@ -1250,7 +1250,7 @@ Doing so adds clarity to the code.  But it's not technically necessary.
 Although the `AlexComponent` has a `name` property, as required by its `Base` class,
 its class signature doesn't mention `Parent`:
 
-<code-example path="cb-dependency-injection/src/app/parent-finder.component.ts" region="alex-class-signature" title="parent-finder.component.ts (AlexComponent class signature)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="alex-class-signature" title="parent-finder.component.ts (AlexComponent class signature)" linenums="false">
 
 </code-example>
 
@@ -1274,9 +1274,9 @@ It doesn't in this example *only* to demonstrate that the code will compile and
 ### A _provideParent()_ helper function
 
 Writing variations of the same parent *alias provider* gets old quickly,
-especially this awful mouthful with a [*forwardRef*](guide/cb-dependency-injection#forwardref):
+especially this awful mouthful with a [*forwardRef*](guide/dependency-injection-in-action#forwardref):
 
-<code-example path="cb-dependency-injection/src/app/parent-finder.component.ts" region="alex-providers" title="cb-dependency-injection/src/app/parent-finder.component.ts" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="alex-providers" title="dependency-injection-in-action/src/app/parent-finder.component.ts" linenums="false">
 
 </code-example>
 
@@ -1284,7 +1284,7 @@ especially this awful mouthful with a [*forwardRef*](guide/cb-dependency-injecti
 
 You can extract that logic into a helper function like this:
 
-<code-example path="cb-dependency-injection/src/app/parent-finder.component.ts" region="provide-the-parent" title="cb-dependency-injection/src/app/parent-finder.component.ts" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="provide-the-parent" title="dependency-injection-in-action/src/app/parent-finder.component.ts" linenums="false">
 
 </code-example>
 
@@ -1292,7 +1292,7 @@ You can extract that logic into a helper function like this:
 
 Now you can add a simpler, more meaningful parent provider to your components:
 
-<code-example path="cb-dependency-injection/src/app/parent-finder.component.ts" region="alice-providers" title="cb-dependency-injection/src/app/parent-finder.component.ts" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="alice-providers" title="dependency-injection-in-action/src/app/parent-finder.component.ts" linenums="false">
 
 </code-example>
 
@@ -1303,7 +1303,7 @@ The application might have a variety of parent types, each with its own *class-i
 
 Here's a revised version that defaults to `parent` but also accepts an optional second parameter for a different parent *class-interface*.
 
-<code-example path="cb-dependency-injection/src/app/parent-finder.component.ts" region="provide-parent" title="cb-dependency-injection/src/app/parent-finder.component.ts" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="provide-parent" title="dependency-injection-in-action/src/app/parent-finder.component.ts" linenums="false">
 
 </code-example>
 
@@ -1311,7 +1311,7 @@ Here's a revised version that defaults to `parent` but also accepts an optional
 
 And here's how you could use it with a different parent type:
 
-<code-example path="cb-dependency-injection/src/app/parent-finder.component.ts" region="beth-providers" title="cb-dependency-injection/src/app/parent-finder.component.ts" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="beth-providers" title="dependency-injection-in-action/src/app/parent-finder.component.ts" linenums="false">
 
 </code-example>
 
@@ -1343,7 +1343,7 @@ appear *above* the class definition.
 
 Break the circularity with `forwardRef`:
 
-<code-example path="cb-dependency-injection/src/app/parent-finder.component.ts" region="alex-providers" title="parent-finder.component.ts (AlexComponent providers)" linenums="false">
+<code-example path="dependency-injection-in-action/src/app/parent-finder.component.ts" region="alex-providers" title="parent-finder.component.ts (AlexComponent providers)" linenums="false">
 
 </code-example>
 
diff --git a/aio/content/marketing/docs.md b/aio/content/guide/docs.md
similarity index 100%
rename from aio/content/marketing/docs.md
rename to aio/content/guide/docs.md
diff --git a/aio/content/guide/dynamic-component-loader.md b/aio/content/guide/dynamic-component-loader.md
index 1b48ce418f..33394f68a9 100644
--- a/aio/content/guide/dynamic-component-loader.md
+++ b/aio/content/guide/dynamic-component-loader.md
@@ -26,7 +26,7 @@ This cookbook shows you how to use `ComponentFactoryResolver` to add components
    * [Final ad banner](guide/dynamic-component-loader#final-ad-banner)
 
 
-See the <live-example name="cb-dynamic-component-loader"></live-example>
+See the <live-example name="dynamic-component-loader"></live-example>
 of the code in this cookbook.
 
 {@a dynamic-loading}
@@ -57,7 +57,7 @@ The ad banner uses a helper directive called `AdDirective` to
 mark valid insertion points in the template.
 
 
-<code-example path="cb-dynamic-component-loader/src/app/ad.directive.ts" title="src/app/ad.directive.ts" linenums="false">
+<code-example path="dynamic-component-loader/src/app/ad.directive.ts" title="src/app/ad.directive.ts" linenums="false">
 
 </code-example>
 
@@ -84,7 +84,7 @@ To apply the `AdDirective`, recall the selector from `ad.directive.ts`,
 where to dynamically load components.
 
 
-<code-example path="cb-dynamic-component-loader/src/app/ad-banner.component.ts" region="ad-host" title="src/app/ad-banner.component.ts (template)" linenums="false">
+<code-example path="dynamic-component-loader/src/app/ad-banner.component.ts" region="ad-host" title="src/app/ad-banner.component.ts (template)" linenums="false">
 
 </code-example>
 
@@ -113,7 +113,7 @@ With its `getAds()` method, `AdBannerComponent` cycles through the array of `AdI
 and loads a new component every 3 seconds by calling `loadComponent()`.
 
 
-<code-example path="cb-dynamic-component-loader/src/app/ad-banner.component.ts" region="class" title="src/app/ad-banner.component.ts (excerpt)" linenums="false">
+<code-example path="dynamic-component-loader/src/app/ad-banner.component.ts" region="class" title="src/app/ad-banner.component.ts (excerpt)" linenums="false">
 
 </code-example>
 
@@ -172,7 +172,7 @@ dynamically loaded components since they load at runtime.
 To ensure that the compiler still generates a factory,
 add dynamically loaded components to the `NgModule`'s `entryComponents` array:
 
-<code-example path="cb-dynamic-component-loader/src/app/app.module.ts" region="entry-components" title="src/app/app.module.ts (entry components)" linenums="false">
+<code-example path="dynamic-component-loader/src/app/app.module.ts" region="entry-components" title="src/app/app.module.ts (entry components)" linenums="false">
 
 </code-example>
 
@@ -191,15 +191,15 @@ Here are two sample components and the `AdComponent` interface for reference:
 
 <code-tabs>
 
-  <code-pane title="hero-job-ad.component.ts" path="cb-dynamic-component-loader/src/app/hero-job-ad.component.ts">
+  <code-pane title="hero-job-ad.component.ts" path="dynamic-component-loader/src/app/hero-job-ad.component.ts">
 
   </code-pane>
 
-  <code-pane title="hero-profile.component.ts" path="cb-dynamic-component-loader/src/app/hero-profile.component.ts">
+  <code-pane title="hero-profile.component.ts" path="dynamic-component-loader/src/app/hero-profile.component.ts">
 
   </code-pane>
 
-  <code-pane title="ad.component.ts" path="cb-dynamic-component-loader/src/app/ad.component.ts">
+  <code-pane title="ad.component.ts" path="dynamic-component-loader/src/app/ad.component.ts">
 
   </code-pane>
 
@@ -219,4 +219,4 @@ Here are two sample components and the `AdComponent` interface for reference:
 
 
 
-See the <live-example name="cb-dynamic-component-loader"></live-example>.
\ No newline at end of file
+See the <live-example name="dynamic-component-loader"></live-example>.
\ No newline at end of file
diff --git a/aio/content/guide/dynamic-form.md b/aio/content/guide/dynamic-form.md
index 3f5e7bc0a2..1e77491d59 100644
--- a/aio/content/guide/dynamic-form.md
+++ b/aio/content/guide/dynamic-form.md
@@ -34,7 +34,7 @@ You can create the forms on the fly *without changing the application code*.
  * [Dynamic template](guide/dynamic-form#dynamic-template)
 
 
-See the <live-example name="cb-dynamic-form"></live-example>.
+See the <live-example name="dynamic-form"></live-example>.
 
 {@a bootstrap}
 
@@ -53,11 +53,11 @@ Bootstrap the `AppModule` in `main.ts`.
 
 <code-tabs>
 
-  <code-pane title="app.module.ts" path="cb-dynamic-form/src/app/app.module.ts">
+  <code-pane title="app.module.ts" path="dynamic-form/src/app/app.module.ts">
 
   </code-pane>
 
-  <code-pane title="main.ts" path="cb-dynamic-form/src/main.ts">
+  <code-pane title="main.ts" path="dynamic-form/src/main.ts">
 
   </code-pane>
 
@@ -75,7 +75,7 @@ The _question_ is the most fundamental object in the model.
 The following `QuestionBase` is a fundamental question class.
 
 
-<code-example path="cb-dynamic-form/src/app/question-base.ts" title="src/app/question-base.ts">
+<code-example path="dynamic-form/src/app/question-base.ts" title="src/app/question-base.ts">
 
 </code-example>
 
@@ -90,7 +90,7 @@ appropriate controls dynamically.
 via the `type` property.
 
 
-<code-example path="cb-dynamic-form/src/app/question-textbox.ts" title="src/app/question-textbox.ts" linenums="false">
+<code-example path="dynamic-form/src/app/question-textbox.ts" title="src/app/question-textbox.ts" linenums="false">
 
 </code-example>
 
@@ -99,7 +99,7 @@ via the `type` property.
 `DropdownQuestion` presents a list of choices in a select box.
 
 
-<code-example path="cb-dynamic-form/src/app/question-dropdown.ts" title="src/app/question-dropdown.ts" linenums="false">
+<code-example path="dynamic-form/src/app/question-dropdown.ts" title="src/app/question-dropdown.ts" linenums="false">
 
 </code-example>
 
@@ -110,7 +110,7 @@ In a nutshell, the form group consumes the metadata from the question model and
 allows you to specify default values and validation rules.
 
 
-<code-example path="cb-dynamic-form/src/app/question-control.service.ts" title="src/app/question-control.service.ts" linenums="false">
+<code-example path="dynamic-form/src/app/question-control.service.ts" title="src/app/question-control.service.ts" linenums="false">
 
 </code-example>
 
@@ -125,11 +125,11 @@ to create components to represent the dynamic form.
 
 <code-tabs>
 
-  <code-pane title="dynamic-form.component.html" path="cb-dynamic-form/src/app/dynamic-form.component.html">
+  <code-pane title="dynamic-form.component.html" path="dynamic-form/src/app/dynamic-form.component.html">
 
   </code-pane>
 
-  <code-pane title="dynamic-form.component.ts" path="cb-dynamic-form/src/app/dynamic-form.component.ts">
+  <code-pane title="dynamic-form.component.ts" path="dynamic-form/src/app/dynamic-form.component.ts">
 
   </code-pane>
 
@@ -145,11 +145,11 @@ question based on values in the data-bound question object.
 
 <code-tabs>
 
-  <code-pane title="dynamic-form-question.component.html" path="cb-dynamic-form/src/app/dynamic-form-question.component.html">
+  <code-pane title="dynamic-form-question.component.html" path="dynamic-form/src/app/dynamic-form-question.component.html">
 
   </code-pane>
 
-  <code-pane title="dynamic-form-question.component.ts" path="cb-dynamic-form/src/app/dynamic-form-question.component.ts">
+  <code-pane title="dynamic-form-question.component.ts" path="dynamic-form/src/app/dynamic-form-question.component.ts">
 
   </code-pane>
 
@@ -182,7 +182,7 @@ directly since you imported `ReactiveFormsModule` from `AppModule`.
  and removing objects from the `questions` array.
 
 
-<code-example path="cb-dynamic-form/src/app/question.service.ts" title="src/app/question.service.ts">
+<code-example path="dynamic-form/src/app/question.service.ts" title="src/app/question.service.ts">
 
 </code-example>
 
@@ -191,7 +191,7 @@ directly since you imported `ReactiveFormsModule` from `AppModule`.
 Finally, display an instance of the form in the `AppComponent` shell.
 
 
-<code-example path="cb-dynamic-form/src/app/app.component.ts" title="app.component.ts">
+<code-example path="dynamic-form/src/app/app.component.ts" title="app.component.ts">
 
 </code-example>
 
diff --git a/aio/content/guide/form-validation.md b/aio/content/guide/form-validation.md
index cfcb69661d..c183febfc7 100644
--- a/aio/content/guide/form-validation.md
+++ b/aio/content/guide/form-validation.md
@@ -60,7 +60,7 @@ and the [Reactive Forms](guide/reactive-forms) guides.
 
 **Try the live example to see and download the full cookbook source code.**
 
-<live-example name="cb-form-validation" embedded=true img="cookbooks/form-validation/plunker.png">
+<live-example name="form-validation" embedded=true img="cookbooks/form-validation/plunker.png">
 
 </live-example>
 
@@ -89,7 +89,7 @@ In this first template validation example,
 notice the HTML that reads the control state and updates the display appropriately.
 Here's an excerpt from the template HTML for a single input control bound to the hero name:
 
-<code-example path="cb-form-validation/src/app/template/hero-form-template1.component.html" region="name-with-error-msg" title="template/hero-form-template1.component.html (Hero name)" linenums="false">
+<code-example path="form-validation/src/app/template/hero-form-template1.component.html" region="name-with-error-msg" title="template/hero-form-template1.component.html (Hero name)" linenums="false">
 
 </code-example>
 
@@ -139,7 +139,7 @@ The component class manages the hero model used in the data binding
 as well as other code to support the view.
 
 
-<code-example path="cb-form-validation/src/app/template/hero-form-template1.component.ts" region="class" title="template/hero-form-template1.component.ts (class)">
+<code-example path="form-validation/src/app/template/hero-form-template1.component.ts" region="class" title="template/hero-form-template1.component.ts (class)">
 
 </code-example>
 
@@ -152,11 +152,11 @@ Here are the complete files for the first version of `HeroFormTemplateCompononen
 
 <code-tabs>
 
-  <code-pane title="template/hero-form-template1.component.html" path="cb-form-validation/src/app/template/hero-form-template1.component.html">
+  <code-pane title="template/hero-form-template1.component.html" path="form-validation/src/app/template/hero-form-template1.component.html">
 
   </code-pane>
 
-  <code-pane title="template/hero-form-template1.component.ts" path="cb-form-validation/src/app/template/hero-form-template1.component.ts">
+  <code-pane title="template/hero-form-template1.component.ts" path="form-validation/src/app/template/hero-form-template1.component.ts">
 
   </code-pane>
 
@@ -189,11 +189,11 @@ Here's the hero name again, excerpted from the revised template
 
 <code-tabs>
 
-  <code-pane title="hero-form-template2.component.html (name #2)" path="cb-form-validation/src/app/template/hero-form-template2.component.html" region="name-with-error-msg">
+  <code-pane title="hero-form-template2.component.html (name #2)" path="form-validation/src/app/template/hero-form-template2.component.html" region="name-with-error-msg">
 
   </code-pane>
 
-  <code-pane title="hero-form-template1.component.html (name #1)" path="cb-form-validation/src/app/template/hero-form-template1.component.html" region="name-with-error-msg">
+  <code-pane title="hero-form-template1.component.html (name #1)" path="form-validation/src/app/template/hero-form-template1.component.html" region="name-with-error-msg">
 
   </code-pane>
 
@@ -229,7 +229,7 @@ The first step is to acquire the form control that Angular created from the temp
 Look back at the top of the component template at the
 `#heroForm` template variable in the `<form>` element:
 
-<code-example path="cb-form-validation/src/app/template/hero-form-template1.component.html" region="form-tag" title="template/hero-form-template1.component.html (form tag)" linenums="false">
+<code-example path="form-validation/src/app/template/hero-form-template1.component.html" region="form-tag" title="template/hero-form-template1.component.html (form tag)" linenums="false">
 
 </code-example>
 
@@ -238,7 +238,7 @@ Look back at the top of the component template at the
 The `heroForm` variable is a reference to the control model that Angular derived from the template.
 Tell Angular to inject that model into the component class's `currentForm` property using a `@ViewChild` query:
 
-<code-example path="cb-form-validation/src/app/template/hero-form-template2.component.ts" region="view-child" title="template/hero-form-template2.component.ts (heroForm)" linenums="false">
+<code-example path="form-validation/src/app/template/hero-form-template2.component.ts" region="view-child" title="template/hero-form-template2.component.ts (heroForm)" linenums="false">
 
 </code-example>
 
@@ -259,7 +259,7 @@ That's the right time to see if there's a new `heroForm` object.
 * When there _is_ a new `heroForm` model, `formChanged()` subscribes to its `valueChanges` _Observable_ property.
 The `onValueChanged` handler looks for validation errors after every keystroke.
 
-<code-example path="cb-form-validation/src/app/template/hero-form-template2.component.ts" region="handler" title="template/hero-form-template2.component.ts (handler)" linenums="false">
+<code-example path="form-validation/src/app/template/hero-form-template2.component.ts" region="handler" title="template/hero-form-template2.component.ts (handler)" linenums="false">
 
 </code-example>
 
@@ -282,7 +282,7 @@ For each field, the `onValueChanged` handler does the following:
 Next, the component needs some error messages of course&mdash;a set for each validated property with
 one message per validation rule:
 
-<code-example path="cb-form-validation/src/app/template/hero-form-template2.component.ts" region="messages" title="template/hero-form-template2.component.ts (messages)" linenums="false">
+<code-example path="form-validation/src/app/template/hero-form-template2.component.ts" region="messages" title="template/hero-form-template2.component.ts (messages)" linenums="false">
 
 </code-example>
 
@@ -332,7 +332,7 @@ You've been reviewing the "Template-driven" approach which requires the `FormsMo
 Here's how you imported it in the `HeroFormTemplateModule`.
 
 
-<code-example path="cb-form-validation/src/app/template/hero-form-template.module.ts" title="template/hero-form-template.module.ts" linenums="false">
+<code-example path="form-validation/src/app/template/hero-form-template.module.ts" title="template/hero-form-template.module.ts" linenums="false">
 
 </code-example>
 
@@ -385,7 +385,7 @@ The following cookbook sample re-writes the hero form in _reactive forms_ style.
 The reactive forms classes and directives come from the Angular `ReactiveFormsModule`, not the `FormsModule`.
 The application module for the reactive forms feature in this sample looks like this:
 
-<code-example path="cb-form-validation/src/app/reactive/hero-form-reactive.module.ts" title="src/app/reactive/hero-form-reactive.module.ts" linenums="false">
+<code-example path="form-validation/src/app/reactive/hero-form-reactive.module.ts" title="src/app/reactive/hero-form-reactive.module.ts" linenums="false">
 
 </code-example>
 
@@ -405,7 +405,7 @@ to the `heroForm` property in the component class.
 The `heroForm` is the control model that the component class builds and maintains.
 
 
-<code-example path="cb-form-validation/src/app/reactive/hero-form-reactive.component.html" region="form-tag" title="cb-form-validation/src/app/reactive/hero-form-reactive.component.html" linenums="false">
+<code-example path="form-validation/src/app/reactive/hero-form-reactive.component.html" region="form-tag" title="form-validation/src/app/reactive/hero-form-reactive.component.html" linenums="false">
 
 </code-example>
 
@@ -416,11 +416,11 @@ Here is the "name" portion of the template again, revised for reactive forms and
 
 <code-tabs>
 
-  <code-pane title="hero-form-reactive.component.html (name #3)" path="cb-form-validation/src/app/reactive/hero-form-reactive.component.html" region="name-with-error-msg">
+  <code-pane title="hero-form-reactive.component.html (name #3)" path="form-validation/src/app/reactive/hero-form-reactive.component.html" region="name-with-error-msg">
 
   </code-pane>
 
-  <code-pane title="hero-form-template1.component.html (name #2)" path="cb-form-validation/src/app/template/hero-form-template2.component.html" region="name-with-error-msg">
+  <code-pane title="hero-form-template1.component.html (name #2)" path="form-validation/src/app/template/hero-form-template2.component.html" region="name-with-error-msg">
 
   </code-pane>
 
@@ -484,11 +484,11 @@ Here's the section of code devoted to that process, paired with the template-dri
 
 <code-tabs>
 
-  <code-pane title="reactive/hero-form-reactive.component.ts (FormBuilder)" path="cb-form-validation/src/app/reactive/hero-form-reactive.component.ts" region="form-builder">
+  <code-pane title="reactive/hero-form-reactive.component.ts (FormBuilder)" path="form-validation/src/app/reactive/hero-form-reactive.component.ts" region="form-builder">
 
   </code-pane>
 
-  <code-pane title="template/hero-form-template2.component.ts (ViewChild)" path="cb-form-validation/src/app/template/hero-form-template2.component.ts" region="view-child">
+  <code-pane title="template/hero-form-template2.component.ts (ViewChild)" path="form-validation/src/app/template/hero-form-template2.component.ts" region="view-child">
 
   </code-pane>
 
@@ -561,7 +561,7 @@ This sample updates the model twice:
 
 The `onSubmit()` method simply replaces the `hero` object with the combined values of the form:
 
-<code-example path="cb-form-validation/src/app/reactive/hero-form-reactive.component.ts" region="on-submit" title="cb-form-validation/src/app/reactive/hero-form-reactive.component.ts" linenums="false">
+<code-example path="form-validation/src/app/reactive/hero-form-reactive.component.ts" region="on-submit" title="form-validation/src/app/reactive/hero-form-reactive.component.ts" linenums="false">
 
 </code-example>
 
@@ -580,7 +580,7 @@ correspond _exactly_ to the hero data object properties.
 
 The `addHero()` method discards pending changes and creates a brand new `hero` model object.
 
-<code-example path="cb-form-validation/src/app/reactive/hero-form-reactive.component.ts" region="add-hero" title="cb-form-validation/src/app/reactive/hero-form-reactive.component.ts" linenums="false">
+<code-example path="form-validation/src/app/reactive/hero-form-reactive.component.ts" region="add-hero" title="form-validation/src/app/reactive/hero-form-reactive.component.ts" linenums="false">
 
 </code-example>
 
@@ -593,15 +593,15 @@ Here's the complete reactive component file, compared to the two template-driven
 
 <code-tabs>
 
-  <code-pane title="reactive/hero-form-reactive.component.ts (#3)" path="cb-form-validation/src/app/reactive/hero-form-reactive.component.ts">
+  <code-pane title="reactive/hero-form-reactive.component.ts (#3)" path="form-validation/src/app/reactive/hero-form-reactive.component.ts">
 
   </code-pane>
 
-  <code-pane title="template/hero-form-template2.component.ts (#2)" path="cb-form-validation/src/app/template/hero-form-template2.component.ts">
+  <code-pane title="template/hero-form-template2.component.ts (#2)" path="form-validation/src/app/template/hero-form-template2.component.ts">
 
   </code-pane>
 
-  <code-pane title="template/hero-form-template1.component.ts (#1)" path="cb-form-validation/src/app/template/hero-form-template1.component.ts">
+  <code-pane title="template/hero-form-template1.component.ts (#1)" path="form-validation/src/app/template/hero-form-template1.component.ts">
 
   </code-pane>
 
@@ -632,7 +632,7 @@ and declared in the `SharedModule`.
 
 Here's the `forbiddenNameValidator()` function:
 
-<code-example path="cb-form-validation/src/app/shared/forbidden-name.directive.ts" region="custom-validator" title="shared/forbidden-name.directive.ts (forbiddenNameValidator)" linenums="false">
+<code-example path="form-validation/src/app/shared/forbidden-name.directive.ts" region="custom-validator" title="shared/forbidden-name.directive.ts (forbiddenNameValidator)" linenums="false">
 
 </code-example>
 
@@ -659,7 +659,7 @@ and whose value is an arbitrary dictionary of values that you could insert into
 In the reactive forms component, the `'name'` control's validator function list
 has a `forbiddenNameValidator` at the bottom.
 
-<code-example path="cb-form-validation/src/app/reactive/hero-form-reactive.component.ts" region="name-validators" title="reactive/hero-form-reactive.component.ts (name validators)" linenums="false">
+<code-example path="form-validation/src/app/reactive/hero-form-reactive.component.ts" region="name-validators" title="reactive/hero-form-reactive.component.ts (name validators)" linenums="false">
 
 </code-example>
 
@@ -668,7 +668,7 @@ has a `forbiddenNameValidator` at the bottom.
 In the _template-driven_ example, the `<input>` has the selector (`forbiddenName`)
 of a custom _attribute directive_, which rejects "bob".
 
-<code-example path="cb-form-validation/src/app/template/hero-form-template2.component.html" region="name-input" title="template/hero-form-template2.component.html (name input)" linenums="false">
+<code-example path="form-validation/src/app/template/hero-form-template2.component.html" region="name-input" title="template/hero-form-template2.component.html (name input)" linenums="false">
 
 </code-example>
 
@@ -679,7 +679,7 @@ The corresponding `ForbiddenValidatorDirective` is a wrapper around the `forbidd
 Angular `forms` recognizes the directive's role in the validation process because the directive registers itself
 with the `NG_VALIDATORS` provider, a provider with an extensible collection of validation directives.
 
-<code-example path="cb-form-validation/src/app/shared/forbidden-name.directive.ts" region="directive-providers" title="shared/forbidden-name.directive.ts (providers)" linenums="false">
+<code-example path="form-validation/src/app/shared/forbidden-name.directive.ts" region="directive-providers" title="shared/forbidden-name.directive.ts (providers)" linenums="false">
 
 </code-example>
 
@@ -687,7 +687,7 @@ with the `NG_VALIDATORS` provider, a provider with an extensible collection of v
 
 Here is the rest of the directive to help you get an idea of how it all comes together:
 
-<code-example path="cb-form-validation/src/app/shared/forbidden-name.directive.ts" region="directive" title="shared/forbidden-name.directive.ts (directive)">
+<code-example path="form-validation/src/app/shared/forbidden-name.directive.ts" region="directive" title="shared/forbidden-name.directive.ts (directive)">
 
 </code-example>
 
diff --git a/aio/content/guide/core.md b/aio/content/guide/fundamentals.md
similarity index 100%
rename from aio/content/guide/core.md
rename to aio/content/guide/fundamentals.md
diff --git a/aio/content/guide/http.md b/aio/content/guide/http.md
index 0c606abda0..9073943590 100644
--- a/aio/content/guide/http.md
+++ b/aio/content/guide/http.md
@@ -264,7 +264,7 @@ With a basic understanding of the component, you're ready to look inside the `He
 In many of the previous samples the app faked the interaction with the server by
 returning mock heroes in a service like this one:
 
-<code-example path="toh-pt4/src/app/hero.service.ts" region="just-get-heroes" title="toh-4/src/app/hero.service.ts" linenums="false">
+<code-example path="toh-pt4/src/app/hero.service.ts" region="just-get-heroes" title="toh-pt4/src/app/hero.service.ts" linenums="false">
 
 </code-example>
 
diff --git a/aio/content/guide/i18n.md b/aio/content/guide/i18n.md
index fdca5b7fc8..615fc15ea5 100644
--- a/aio/content/guide/i18n.md
+++ b/aio/content/guide/i18n.md
@@ -41,7 +41,7 @@ Angular's _internationalization_ (_i18n_) tools help make your app available in
   * [Translation file maintenance and _id_ changes](guide/i18n#maintenance)
 
 
-Try this <live-example name="cb-i18n" title="i18n Example in Spanish">live example</live-example>
+Try this <live-example name="i18n" title="i18n Example in Spanish">live example</live-example>
 of a JIT-compiled app, translated into Spanish.
 
 
@@ -115,7 +115,7 @@ After translation, the compiler removes it.
 In the accompanying sample, an `<h1>` tag displays a simple English language greeting
 that you translate into Spanish:
 
-<code-example path="cb-i18n/src/app/app.component.1.html" region="greeting" title="src/app/app.component.html" linenums="false">
+<code-example path="i18n/src/app/app.component.1.html" region="greeting" title="src/app/app.component.html" linenums="false">
 
 </code-example>
 
@@ -124,7 +124,7 @@ that you translate into Spanish:
 Add the `i18n` attribute to the tag to mark it for translation.
 
 
-<code-example path="cb-i18n/src/app/app.component.1.html" region="i18n-attribute" title="src/app/app.component.html" linenums="false">
+<code-example path="i18n/src/app/app.component.1.html" region="i18n-attribute" title="src/app/app.component.html" linenums="false">
 
 </code-example>
 
@@ -140,7 +140,7 @@ need a description of the message.
 Assign a description to the i18n attribute:
 
 
-<code-example path="cb-i18n/src/app/app.component.1.html" region="i18n-attribute-desc" title="src/app/app.component.html" linenums="false">
+<code-example path="i18n/src/app/app.component.1.html" region="i18n-attribute-desc" title="src/app/app.component.html" linenums="false">
 
 </code-example>
 
@@ -153,7 +153,7 @@ In front of the description, add some contextual meaning to the assigned string,
 separating it from the description with the `|` character (`<meaning>|<description>`):
 
 
-<code-example path="cb-i18n/src/app/app.component.html" region="i18n-attribute-meaning" title="src/app/app.component.html" linenums="false">
+<code-example path="i18n/src/app/app.component.html" region="i18n-attribute-meaning" title="src/app/app.component.html" linenums="false">
 
 </code-example>
 
@@ -179,7 +179,7 @@ Here are two techniques to try.
 (1) Wrap the text in an `<ng-container>` element. The `<ng-container>` is never renderered:
 
 
-<code-example path="cb-i18n/src/app/app.component.html" region="i18n-ng-container" title="src/app/app.component.html" linenums="false">
+<code-example path="i18n/src/app/app.component.html" region="i18n-ng-container" title="src/app/app.component.html" linenums="false">
 
 </code-example>
 
@@ -188,7 +188,7 @@ Here are two techniques to try.
 (2) Wrap the text in a pair of HTML comments:
 
 
-<code-example path="cb-i18n/src/app/app.component.html" region="i18n-with-comment" title="src/app/app.component.html" linenums="false">
+<code-example path="i18n/src/app/app.component.html" region="i18n-with-comment" title="src/app/app.component.html" linenums="false">
 
 </code-example>
 
@@ -202,7 +202,7 @@ Here are two techniques to try.
 You've added an image to your template. You care about accessibility too so you add a `title` attribute:
 
 
-<code-example path="cb-i18n/src/app/app.component.1.html" region="i18n-title" title="src/app/app.component.html" linenums="false">
+<code-example path="i18n/src/app/app.component.1.html" region="i18n-title" title="src/app/app.component.html" linenums="false">
 
 </code-example>
 
@@ -215,7 +215,7 @@ name of the attribute to translate.
 To translate the `title` on the `img` tag from the previous example, write:
 
 
-<code-example path="cb-i18n/src/app/app.component.html" region="i18n-title-translate" title="src/app/app.component.html" linenums="false">
+<code-example path="i18n/src/app/app.component.html" region="i18n-title-translate" title="src/app/app.component.html" linenums="false">
 
 </code-example>
 
@@ -239,7 +239,7 @@ Other languages might express the _cardinality_ differently.
 Here's how you could mark up the component template to display the phrase appropriate to the number of wolves:
 
 
-<code-example path="cb-i18n/src/app/app.component.html" region="i18n-plural" title="src/app/app.component.html" linenums="false">
+<code-example path="i18n/src/app/app.component.html" region="i18n-plural" title="src/app/app.component.html" linenums="false">
 
 </code-example>
 
@@ -303,7 +303,7 @@ property, which outputs either an "m" or an "f".
 The message maps those values to the appropriate translation:
 
 
-<code-example path="cb-i18n/src/app/app.component.html" region="i18n-select" title="src/app/app.component.html" linenums="false">
+<code-example path="i18n/src/app/app.component.html" region="i18n-select" title="src/app/app.component.html" linenums="false">
 
 </code-example>
 
@@ -478,7 +478,7 @@ This sample file is easy to translate without a special editor or knowledge of S
 Open `messages.es.xlf` and find the first `<trans-unit>` section:
 
 
-<code-example path="cb-i18n/src/locale/messages.es.xlf.html" region="translated-hello" title="src/locale/messages.es.xlf (&lt;trans-unit&gt;)" linenums="false">
+<code-example path="i18n/src/locale/messages.es.xlf.html" region="translated-hello" title="src/locale/messages.es.xlf (&lt;trans-unit&gt;)" linenums="false">
 
 </code-example>
 
@@ -489,7 +489,7 @@ This XML element represents the translation of the `<h1>` greeting tag you marke
 Using the _source_, _description_, and _meaning_ elements to guide your translation,
 replace the `<target/>` tag with the Spanish greeting:
 
-<code-example path="cb-i18n/src/locale/messages.es.xlf.html" region="translated-hello" title="src/locale/messages.es.xlf (&lt;trans-unit&gt;, after translation)" linenums="false">
+<code-example path="i18n/src/locale/messages.es.xlf.html" region="translated-hello" title="src/locale/messages.es.xlf (&lt;trans-unit&gt;, after translation)" linenums="false">
 
 </code-example>
 
@@ -512,7 +512,7 @@ See the **[translation file maintenance discussion](guide/i18n#maintenance)**.
 Translate the other text nodes the same way:
 
 
-<code-example path="cb-i18n/src/locale/messages.es.xlf.html" region="translated-other-nodes" title="src/locale/messages.es.xlf (&lt;trans-unit&gt;)" linenums="false">
+<code-example path="i18n/src/locale/messages.es.xlf.html" region="translated-other-nodes" title="src/locale/messages.es.xlf (&lt;trans-unit&gt;)" linenums="false">
 
 </code-example>
 
@@ -540,7 +540,7 @@ In this example, you know the translation unit for the `select` must be just bel
 To translate a `plural`, translate its ICU format match values:
 
 
-<code-example path="cb-i18n/src/locale/messages.es.xlf.html" region="translated-plural" title="src/locale/messages.es.xlf (&lt;trans-unit&gt;)" linenums="false">
+<code-example path="i18n/src/locale/messages.es.xlf.html" region="translated-plural" title="src/locale/messages.es.xlf (&lt;trans-unit&gt;)" linenums="false">
 
 </code-example>
 
@@ -553,7 +553,7 @@ To translate a `plural`, translate its ICU format match values:
 The `select` behaves a little differently. Here again is the ICU format message in the component template:
 
 
-<code-example path="cb-i18n/src/app/app.component.html" region="i18n-select" title="src/app/app.component.html" linenums="false">
+<code-example path="i18n/src/app/app.component.html" region="i18n-select" title="src/app/app.component.html" linenums="false">
 
 </code-example>
 
@@ -566,7 +566,7 @@ In place of the `select` is a placeholder, `<x id="ICU">`, that represents the `
 Translate the text and leave the placeholder where it is.
 
 
-<code-example path="cb-i18n/src/locale/messages.es.xlf.html" region="translate-select-1" title="src/locale/messages.es.xlf (&lt;trans-unit&gt;)" linenums="false">
+<code-example path="i18n/src/locale/messages.es.xlf.html" region="translate-select-1" title="src/locale/messages.es.xlf (&lt;trans-unit&gt;)" linenums="false">
 
 </code-example>
 
@@ -575,7 +575,7 @@ Translate the text and leave the placeholder where it is.
 The second translation unit, immediately below the first one, contains the `select` message. Translate that.
 
 
-<code-example path="cb-i18n/src/locale/messages.es.xlf.html" region="translate-select-2" title="src/locale/messages.es.xlf (&lt;trans-unit&gt;)" linenums="false">
+<code-example path="i18n/src/locale/messages.es.xlf.html" region="translate-select-2" title="src/locale/messages.es.xlf (&lt;trans-unit&gt;)" linenums="false">
 
 </code-example>
 
@@ -584,7 +584,7 @@ The second translation unit, immediately below the first one, contains the `sele
 Here they are together, after translation:
 
 
-<code-example path="cb-i18n/src/locale/messages.es.xlf.html" region="translated-select" title="src/locale/messages.es.xlf (&lt;trans-unit&gt;)" linenums="false">
+<code-example path="i18n/src/locale/messages.es.xlf.html" region="translated-select" title="src/locale/messages.es.xlf (&lt;trans-unit&gt;)" linenums="false">
 
 </code-example>
 
@@ -613,23 +613,23 @@ When the previous steps finish, the sample app _and_ its translation file are as
 
 <code-tabs>
 
-  <code-pane title="src/app/app.component.html" path="cb-i18n/src/app/app.component.html">
+  <code-pane title="src/app/app.component.html" path="i18n/src/app/app.component.html">
 
   </code-pane>
 
-  <code-pane title="src/app/app.component.ts" path="cb-i18n/src/app/app.component.ts">
+  <code-pane title="src/app/app.component.ts" path="i18n/src/app/app.component.ts">
 
   </code-pane>
 
-  <code-pane title="src/app/app.module.ts" path="cb-i18n/src/app/app.module.ts">
+  <code-pane title="src/app/app.module.ts" path="i18n/src/app/app.module.ts">
 
   </code-pane>
 
-  <code-pane title="src/main.ts" path="cb-i18n/src/main.1.ts">
+  <code-pane title="src/main.ts" path="i18n/src/main.1.ts">
 
   </code-pane>
 
-  <code-pane title="src/locale/messages.es.xlf" path="cb-i18n/src/locale/messages.es.xlf.html">
+  <code-pane title="src/locale/messages.es.xlf" path="i18n/src/locale/messages.es.xlf.html">
 
   </code-pane>
 
@@ -678,7 +678,7 @@ Translation with the JIT compiler is a dynamic process of:
 
 Open `index.html` and revise the launch script as follows:
 
-<code-example path="cb-i18n/src/index.html" region="i18n" title="index.html (launch script)" linenums="false">
+<code-example path="i18n/src/index.html" region="i18n" title="index.html (launch script)" linenums="false">
 
 </code-example>
 
@@ -701,7 +701,7 @@ You'll need it to import the language translation file.
 SystemJS doesn't ship with a raw text plugin but it's easy to add.
 Create the following `systemjs-text-plugin.js` in the `src/` folder:
 
-<code-example path="cb-i18n/src/systemjs-text-plugin.js" title="src/systemjs-text-plugin.js" linenums="false">
+<code-example path="i18n/src/systemjs-text-plugin.js" title="src/systemjs-text-plugin.js" linenums="false">
 
 </code-example>
 
@@ -723,7 +723,7 @@ The `getTranslationProviders()` function in the following `src/app/i18n-provider
 creates those providers based on the user's _locale_
 and the corresponding translation file:
 
-<code-example path="cb-i18n/src/app/i18n-providers.ts" title="src/app/i18n-providers.ts">
+<code-example path="i18n/src/app/i18n-providers.ts" title="src/app/i18n-providers.ts">
 
 </code-example>
 
@@ -757,7 +757,7 @@ You'll create an _options_ object with the translation providers from `getTransl
 and pass it to `bootstrapModule`.
 Open the `src/main.ts` and modify the bootstrap code as follows:
 
-<code-example path="cb-i18n/src/main.ts" title="src/main.ts" linenums="false">
+<code-example path="i18n/src/main.ts" title="src/main.ts" linenums="false">
 
 </code-example>
 
diff --git a/aio/content/guide/lifecycle-hooks.md b/aio/content/guide/lifecycle-hooks.md
index 20df044bb5..ed49cb6faa 100644
--- a/aio/content/guide/lifecycle-hooks.md
+++ b/aio/content/guide/lifecycle-hooks.md
@@ -593,7 +593,7 @@ created under test or before you decide to display it.
 Constructors should do no more than set the initial local variables to simple values.
 
 An `ngOnInit()` is a good place for a component to fetch its initial data. The
-[Tour of Heroes Tutorial](tutorial/toh-pt4#oninit) and [HTTP Client](guide/server-communication#oninit)
+[Tour of Heroes Tutorial](tutorial/toh-pt4#oninit) and [HTTP Client](guide/http#oninit)
 guides show how.
 
 
diff --git a/aio/content/guide/npm-packages.md b/aio/content/guide/npm-packages.md
index 312ad7e1f0..5597e0367c 100644
--- a/aio/content/guide/npm-packages.md
+++ b/aio/content/guide/npm-packages.md
@@ -170,7 +170,7 @@ without waiting for Angular updates.
 ***angular-in-memory-web-api***: An Angular-supported library that simulates a remote server's web api
 without requiring an actual server or real HTTP calls.
 Good for demos, samples, and early stage development (before you even have a server).
-Read about it in the [HTTP Client](guide/server-communication#in-mem-web-api) page.
+Read about it in the [HTTP Client](guide/http#in-mem-web-api) page.
 
 ***bootstrap***: [Bootstrap](http://getbootstrap.com/) is a popular HTML and CSS framework for designing responsive web apps.
 Some of the samples improve their appearance with *bootstrap*.
diff --git a/aio/content/guide/pipes.md b/aio/content/guide/pipes.md
index 542bd0b499..9c0dcb12c6 100644
--- a/aio/content/guide/pipes.md
+++ b/aio/content/guide/pipes.md
@@ -536,7 +536,7 @@ Remember that impure pipes are called every few milliseconds.
 If you're not careful, this pipe will punish the server with requests.
 
 In the following code, the pipe only calls the server when the request URL changes and it caches the server response.
-The code uses the [Angular http](guide/server-communication) client to retrieve data</span>:
+The code uses the [Angular http](guide/http) client to retrieve data</span>:
 
 
 <code-example path="pipes/src/app/fetch-json.pipe.ts" title="src/app/fetch-json.pipe.ts">
diff --git a/aio/content/guide/router.md b/aio/content/guide/router.md
index 382baf3343..59e8d8e3f0 100644
--- a/aio/content/guide/router.md
+++ b/aio/content/guide/router.md
@@ -1244,7 +1244,7 @@ Now you'll learn the following:
 This example recreates the heroes feature in the "Services" episode of the
 [Tour of Heroes tutorial](tutorial/toh-pt4 "Tour of Heroes: Services"),
 and you'll be copying much of the code 
-from the <live-example name="toh-4" title="Tour of Heroes: Services example code"></live-example>.
+from the <live-example name="toh-pt4" title="Tour of Heroes: Services example code"></live-example>.
 
 Here's how the user will experience this version of the app:
 
@@ -1277,7 +1277,7 @@ Follow these steps:
 * Delete the placeholder `hero-list.component.ts` that's in the `app` folder.
 * Create a new `hero-list.component.ts` under `src/app/heroes`.
 * Copy into it the contents of the `app.component.ts` from
-  the <live-example name="toh-4" title="Tour of Heroes: Services example code">"Services" tutorial</live-example>.
+  the <live-example name="toh-pt4" title="Tour of Heroes: Services example code">"Services" tutorial</live-example>.
 * Make a few minor but necessary changes:
 
   * Delete the `selector` (routed components don't need them).
diff --git a/aio/content/guide/set-document-title.md b/aio/content/guide/set-document-title.md
index 569873ebb8..edec412119 100644
--- a/aio/content/guide/set-document-title.md
+++ b/aio/content/guide/set-document-title.md
@@ -13,7 +13,7 @@ Setting the document or window title using the Title service.
 Your app should be able to make the browser title bar say whatever you want it to say.
 This cookbook explains how to do it.
 
-See the <live-example name="cb-set-document-title"></live-example>.
+See the <live-example name="set-document-title"></live-example>.
 
 
 <table>
@@ -80,7 +80,7 @@ for getting and setting the current HTML document title:
 You can inject the `Title` service into the root `AppComponent` and expose a bindable `setTitle` method that calls it:
 
 
-<code-example path="cb-set-document-title/src/app/app.component.ts" region="class" title="src/app/app.component.ts (class)" linenums="false">
+<code-example path="set-document-title/src/app/app.component.ts" region="class" title="src/app/app.component.ts (class)" linenums="false">
 
 </code-example>
 
@@ -99,15 +99,15 @@ Here's the complete solution:
 
 <code-tabs>
 
-  <code-pane title="src/main.ts" path="cb-set-document-title/src/main.ts">
+  <code-pane title="src/main.ts" path="set-document-title/src/main.ts">
 
   </code-pane>
 
-  <code-pane title="src/app/app.module.ts" path="cb-set-document-title/src/app/app.module.ts">
+  <code-pane title="src/app/app.module.ts" path="set-document-title/src/app/app.module.ts">
 
   </code-pane>
 
-  <code-pane title="src/app/app.component.ts" path="cb-set-document-title/src/app/app.component.ts">
+  <code-pane title="src/app/app.component.ts" path="set-document-title/src/app/app.component.ts">
 
   </code-pane>
 
diff --git a/aio/content/guide/setup-systemjs-anatomy.md b/aio/content/guide/setup-systemjs-anatomy.md
index 0718fba680..c203727194 100644
--- a/aio/content/guide/setup-systemjs-anatomy.md
+++ b/aio/content/guide/setup-systemjs-anatomy.md
@@ -359,7 +359,7 @@ If you do, this page can help you understand their purpose.
       and complains when you violate one of its rules.
 
       This file defines linting rules favored by the
-      [Angular style guide](guide/style-guide) and by the authors of the documentation.
+      [Angular style guide](guide/styleguide) and by the authors of the documentation.
     </td>
 
   </tr>
diff --git a/aio/content/guide/structural-directives.md b/aio/content/guide/structural-directives.md
index fe684347f9..ec186833a0 100644
--- a/aio/content/guide/structural-directives.md
+++ b/aio/content/guide/structural-directives.md
@@ -704,7 +704,7 @@ Pick something short that fits you or your company.
 In this example, the prefix is `my`.
 
 
-The directive _class_ name ends in `Directive` per the [style guide](guide/style-guide#02-03 "Angular Style Guide").
+The directive _class_ name ends in `Directive` per the [style guide](guide/styleguide#02-03 "Angular Style Guide").
 Angular's own directives do not.
 
 ### _TemplateRef_ and _ViewContainerRef_
diff --git a/aio/content/guide/style-guide.md b/aio/content/guide/styleguide.md
similarity index 86%
rename from aio/content/guide/style-guide.md
rename to aio/content/guide/styleguide.md
index 3602c8c114..7922a73653 100644
--- a/aio/content/guide/style-guide.md
+++ b/aio/content/guide/styleguide.md
@@ -18,16 +18,16 @@ This style guide presents preferred conventions and, as importantly, explains wh
 
 # Contents
 
-  * [Single responsibility](guide/style-guide#single-responsibility)
-  * [Naming](guide/style-guide#naming)
-  * [Coding conventions](guide/style-guide#coding-conventions)
-  * [App structure and Angular modules](guide/style-guide#application-structure-and-angular-modules)
-  * [Components](guide/style-guide#components)
-  * [Directives](guide/style-guide#directives)
-  * [Services](guide/style-guide#services)
-  * [Data services](guide/style-guide#data-services)
-  * [Lifecycle hooks](guide/style-guide#lifecycle-hooks)
-  * [Appendix](guide/style-guide#appendix)
+  * [Single responsibility](guide/styleguide#single-responsibility)
+  * [Naming](guide/styleguide#naming)
+  * [Coding conventions](guide/styleguide#coding-conventions)
+  * [App structure and Angular modules](guide/styleguide#application-structure-and-angular-modules)
+  * [Components](guide/styleguide#components)
+  * [Directives](guide/styleguide#directives)
+  * [Services](guide/styleguide#services)
+  * [Data services](guide/styleguide#data-services)
+  * [Lifecycle hooks](guide/styleguide#lifecycle-hooks)
+  * [Appendix](guide/styleguide#appendix)
 
 
 
@@ -173,7 +173,7 @@ defines the `Hero` model object, and loads heroes from the server all in the sam
 *Don't do this*.
 
 
-<code-example path="style-guide/src/01-01/app/heroes/hero.component.avoid.ts" title="app/heroes/hero.component.ts">
+<code-example path="styleguide/src/01-01/app/heroes/hero.component.avoid.ts" title="app/heroes/hero.component.ts">
 
 </code-example>
 
@@ -185,31 +185,31 @@ supporting classes into their own, dedicated files.
 
 <code-tabs>
 
-  <code-pane title="main.ts" path="style-guide/src/01-01/main.ts">
+  <code-pane title="main.ts" path="styleguide/src/01-01/main.ts">
 
   </code-pane>
 
-  <code-pane title="app/app.module.ts" path="style-guide/src/01-01/app/app.module.ts">
+  <code-pane title="app/app.module.ts" path="styleguide/src/01-01/app/app.module.ts">
 
   </code-pane>
 
-  <code-pane title="app/app.component.ts" path="style-guide/src/01-01/app/app.component.ts">
+  <code-pane title="app/app.component.ts" path="styleguide/src/01-01/app/app.component.ts">
 
   </code-pane>
 
-  <code-pane title="app/heroes/heroes.component.ts" path="style-guide/src/01-01/app/heroes/heroes.component.ts">
+  <code-pane title="app/heroes/heroes.component.ts" path="styleguide/src/01-01/app/heroes/heroes.component.ts">
 
   </code-pane>
 
-  <code-pane title="app/heroes/shared/hero.service.ts" path="style-guide/src/01-01/app/heroes/shared/hero.service.ts">
+  <code-pane title="app/heroes/shared/hero.service.ts" path="styleguide/src/01-01/app/heroes/shared/hero.service.ts">
 
   </code-pane>
 
-  <code-pane title="app/heroes/shared/hero.model.ts" path="style-guide/src/01-01/app/heroes/shared/hero.model.ts">
+  <code-pane title="app/heroes/shared/hero.model.ts" path="styleguide/src/01-01/app/heroes/shared/hero.model.ts">
 
   </code-pane>
 
-  <code-pane title="app/heroes/shared/mock-heroes.ts" path="style-guide/src/01-01/app/heroes/shared/mock-heroes.ts">
+  <code-pane title="app/heroes/shared/mock-heroes.ts" path="styleguide/src/01-01/app/heroes/shared/mock-heroes.ts">
 
   </code-pane>
 
@@ -935,7 +935,7 @@ As always, strive for consistency.
 
 
 
-<code-example path="style-guide/src/02-05/main.ts" title="main.ts">
+<code-example path="styleguide/src/02-05/main.ts" title="main.ts">
 
 </code-example>
 
@@ -1056,7 +1056,7 @@ For example, the prefix `toh` represents from **T**our **o**f **H**eroes and the
 
 
 
-<code-example path="style-guide/src/02-07/app/heroes/hero.component.avoid.ts" region="example" title="app/heroes/hero.component.ts">
+<code-example path="styleguide/src/02-07/app/heroes/hero.component.avoid.ts" region="example" title="app/heroes/hero.component.ts">
 
 </code-example>
 
@@ -1064,7 +1064,7 @@ For example, the prefix `toh` represents from **T**our **o**f **H**eroes and the
 
 
 
-<code-example path="style-guide/src/02-07/app/users/users.component.avoid.ts" region="example" title="app/users/users.component.ts">
+<code-example path="styleguide/src/02-07/app/users/users.component.avoid.ts" region="example" title="app/users/users.component.ts">
 
 </code-example>
 
@@ -1072,7 +1072,7 @@ For example, the prefix `toh` represents from **T**our **o**f **H**eroes and the
 
 
 
-<code-example path="style-guide/src/02-07/app/heroes/hero.component.ts" region="example" title="app/heroes/hero.component.ts">
+<code-example path="styleguide/src/02-07/app/heroes/hero.component.ts" region="example" title="app/heroes/hero.component.ts">
 
 </code-example>
 
@@ -1080,7 +1080,7 @@ For example, the prefix `toh` represents from **T**our **o**f **H**eroes and the
 
 
 
-<code-example path="style-guide/src/02-07/app/users/users.component.ts" region="example" title="app/users/users.component.ts">
+<code-example path="styleguide/src/02-07/app/users/users.component.ts" region="example" title="app/users/users.component.ts">
 
 </code-example>
 
@@ -1137,7 +1137,7 @@ For example, the prefix `toh` represents from **T**our **o**f **H**eroes and the
 
 
 
-<code-example path="style-guide/src/02-08/app/shared/validate.directive.avoid.ts" region="example" title="app/shared/validate.directive.ts">
+<code-example path="styleguide/src/02-08/app/shared/validate.directive.avoid.ts" region="example" title="app/shared/validate.directive.ts">
 
 </code-example>
 
@@ -1145,7 +1145,7 @@ For example, the prefix `toh` represents from **T**our **o**f **H**eroes and the
 
 
 
-<code-example path="style-guide/src/02-08/app/shared/validate.directive.ts" region="example" title="app/shared/validate.directive.ts">
+<code-example path="styleguide/src/02-08/app/shared/validate.directive.ts" region="example" title="app/shared/validate.directive.ts">
 
 </code-example>
 
@@ -1748,7 +1748,7 @@ By convention, upper camel case indicates a constructable asset.
 
 
 
-<code-example path="style-guide/src/03-01/app/core/exception.service.avoid.ts" region="example" title="app/shared/exception.service.ts">
+<code-example path="styleguide/src/03-01/app/core/exception.service.avoid.ts" region="example" title="app/shared/exception.service.ts">
 
 </code-example>
 
@@ -1756,7 +1756,7 @@ By convention, upper camel case indicates a constructable asset.
 
 
 
-<code-example path="style-guide/src/03-01/app/core/exception.service.ts" region="example" title="app/shared/exception.service.ts">
+<code-example path="styleguide/src/03-01/app/core/exception.service.ts" region="example" title="app/shared/exception.service.ts">
 
 </code-example>
 
@@ -1864,7 +1864,7 @@ It is rarely worth the effort to change them at the risk of breaking existing co
 
 
 
-<code-example path="style-guide/src/03-02/app/core/data.service.ts" title="app/shared/data.service.ts">
+<code-example path="styleguide/src/03-02/app/core/data.service.ts" title="app/shared/data.service.ts">
 
 </code-example>
 
@@ -1956,7 +1956,7 @@ discourage the `I` prefix.
 
 
 
-<code-example path="style-guide/src/03-03/app/core/hero-collector.service.avoid.ts" region="example" title="app/shared/hero-collector.service.ts">
+<code-example path="styleguide/src/03-03/app/core/hero-collector.service.avoid.ts" region="example" title="app/shared/hero-collector.service.ts">
 
 </code-example>
 
@@ -1964,7 +1964,7 @@ discourage the `I` prefix.
 
 
 
-<code-example path="style-guide/src/03-03/app/core/hero-collector.service.ts" region="example" title="app/shared/hero-collector.service.ts">
+<code-example path="styleguide/src/03-03/app/core/hero-collector.service.ts" region="example" title="app/shared/hero-collector.service.ts">
 
 </code-example>
 
@@ -2033,7 +2033,7 @@ discourage the `I` prefix.
 
 
 
-<code-example path="style-guide/src/03-04/app/core/toast.service.avoid.ts" region="example" title="app/shared/toast.service.ts">
+<code-example path="styleguide/src/03-04/app/core/toast.service.avoid.ts" region="example" title="app/shared/toast.service.ts">
 
 </code-example>
 
@@ -2041,7 +2041,7 @@ discourage the `I` prefix.
 
 
 
-<code-example path="style-guide/src/03-04/app/core/toast.service.ts" region="example" title="app/shared/toast.service.ts">
+<code-example path="styleguide/src/03-04/app/core/toast.service.ts" region="example" title="app/shared/toast.service.ts">
 
 </code-example>
 
@@ -2110,7 +2110,7 @@ discourage the `I` prefix.
 
 
 
-<code-example path="style-guide/src/03-06/app/heroes/shared/hero.service.avoid.ts" region="example" title="app/heroes/shared/hero.service.ts">
+<code-example path="styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts" region="example" title="app/heroes/shared/hero.service.ts">
 
 </code-example>
 
@@ -2118,7 +2118,7 @@ discourage the `I` prefix.
 
 
 
-<code-example path="style-guide/src/03-06/app/heroes/shared/hero.service.ts" region="example" title="app/heroes/shared/hero.service.ts">
+<code-example path="styleguide/src/03-06/app/heroes/shared/hero.service.ts" region="example" title="app/heroes/shared/hero.service.ts">
 
 </code-example>
 
@@ -2858,7 +2858,7 @@ for example, in `/src/app`.
 
 
 
-<code-example path="style-guide/src/04-08/app/app.module.ts" region="example" title="app/app.module.ts">
+<code-example path="styleguide/src/04-08/app/app.module.ts" region="example" title="app/app.module.ts">
 
 </code-example>
 
@@ -3207,27 +3207,27 @@ Yet there is a real danger of that happening if the `SharedModule` provides a se
 
 <code-tabs>
 
-  <code-pane title="app/shared/shared.module.ts" path="style-guide/src/04-10/app/shared/shared.module.ts">
+  <code-pane title="app/shared/shared.module.ts" path="styleguide/src/04-10/app/shared/shared.module.ts">
 
   </code-pane>
 
-  <code-pane title="app/shared/init-caps.pipe.ts" path="style-guide/src/04-10/app/shared/init-caps.pipe.ts">
+  <code-pane title="app/shared/init-caps.pipe.ts" path="styleguide/src/04-10/app/shared/init-caps.pipe.ts">
 
   </code-pane>
 
-  <code-pane title="app/shared/filter-text/filter-text.component.ts" path="style-guide/src/04-10/app/shared/filter-text/filter-text.component.ts">
+  <code-pane title="app/shared/filter-text/filter-text.component.ts" path="styleguide/src/04-10/app/shared/filter-text/filter-text.component.ts">
 
   </code-pane>
 
-  <code-pane title="app/shared/filter-text/filter-text.service.ts" path="style-guide/src/04-10/app/shared/filter-text/filter-text.service.ts">
+  <code-pane title="app/shared/filter-text/filter-text.service.ts" path="styleguide/src/04-10/app/shared/filter-text/filter-text.service.ts">
 
   </code-pane>
 
-  <code-pane title="app/heroes/heroes.component.ts" path="style-guide/src/04-10/app/heroes/heroes.component.ts">
+  <code-pane title="app/heroes/heroes.component.ts" path="styleguide/src/04-10/app/heroes/heroes.component.ts">
 
   </code-pane>
 
-  <code-pane title="app/heroes/heroes.component.html" path="style-guide/src/04-10/app/heroes/heroes.component.html">
+  <code-pane title="app/heroes/heroes.component.html" path="styleguide/src/04-10/app/heroes/heroes.component.html">
 
   </code-pane>
 
@@ -3511,35 +3511,35 @@ Yet there is a real danger of that happening accidentally if the `CoreModule` pr
 
 <code-tabs>
 
-  <code-pane title="app/app.module.ts" path="style-guide/src/04-11/app/app.module.ts" region="example">
+  <code-pane title="app/app.module.ts" path="styleguide/src/04-11/app/app.module.ts" region="example">
 
   </code-pane>
 
-  <code-pane title="app/core/core.module.ts" path="style-guide/src/04-11/app/core/core.module.ts">
+  <code-pane title="app/core/core.module.ts" path="styleguide/src/04-11/app/core/core.module.ts">
 
   </code-pane>
 
-  <code-pane title="app/core/logger.service.ts" path="style-guide/src/04-11/app/core/logger.service.ts">
+  <code-pane title="app/core/logger.service.ts" path="styleguide/src/04-11/app/core/logger.service.ts">
 
   </code-pane>
 
-  <code-pane title="app/core/nav/nav.component.ts" path="style-guide/src/04-11/app/core/nav/nav.component.ts">
+  <code-pane title="app/core/nav/nav.component.ts" path="styleguide/src/04-11/app/core/nav/nav.component.ts">
 
   </code-pane>
 
-  <code-pane title="app/core/nav/nav.component.html" path="style-guide/src/04-11/app/core/nav/nav.component.html">
+  <code-pane title="app/core/nav/nav.component.html" path="styleguide/src/04-11/app/core/nav/nav.component.html">
 
   </code-pane>
 
-  <code-pane title="app/core/spinner/spinner.component.ts" path="style-guide/src/04-11/app/core/spinner/spinner.component.ts">
+  <code-pane title="app/core/spinner/spinner.component.ts" path="styleguide/src/04-11/app/core/spinner/spinner.component.ts">
 
   </code-pane>
 
-  <code-pane title="app/core/spinner/spinner.component.html" path="style-guide/src/04-11/app/core/spinner/spinner.component.html">
+  <code-pane title="app/core/spinner/spinner.component.html" path="styleguide/src/04-11/app/core/spinner/spinner.component.html">
 
   </code-pane>
 
-  <code-pane title="app/core/spinner/spinner.service.ts" path="style-guide/src/04-11/app/core/spinner/spinner.service.ts">
+  <code-pane title="app/core/spinner/spinner.service.ts" path="styleguide/src/04-11/app/core/spinner/spinner.service.ts">
 
   </code-pane>
 
@@ -3606,11 +3606,11 @@ Only the root `AppModule` should import the `CoreModule`.
 
 <code-tabs>
 
-  <code-pane title="app/core/module-import-guard.ts" path="style-guide/src/04-12/app/core/module-import-guard.ts">
+  <code-pane title="app/core/module-import-guard.ts" path="styleguide/src/04-12/app/core/module-import-guard.ts">
 
   </code-pane>
 
-  <code-pane title="app/core/core.module.ts" path="style-guide/src/04-12/app/core/core.module.ts">
+  <code-pane title="app/core/core.module.ts" path="styleguide/src/04-12/app/core/core.module.ts">
 
   </code-pane>
 
@@ -3709,7 +3709,7 @@ A typical *lazy loaded folder* contains a *routing component*, its child compone
 
 
 
-<code-example path="style-guide/src/05-02/app/heroes/shared/hero-button/hero-button.component.avoid.ts" region="example" title="app/heroes/shared/hero-button/hero-button.component.ts">
+<code-example path="styleguide/src/05-02/app/heroes/shared/hero-button/hero-button.component.avoid.ts" region="example" title="app/heroes/shared/hero-button/hero-button.component.ts">
 
 </code-example>
 
@@ -3719,11 +3719,11 @@ A typical *lazy loaded folder* contains a *routing component*, its child compone
 
 <code-tabs>
 
-  <code-pane title="app/heroes/shared/hero-button/hero-button.component.ts" path="style-guide/src/05-02/app/heroes/shared/hero-button/hero-button.component.ts" region="example">
+  <code-pane title="app/heroes/shared/hero-button/hero-button.component.ts" path="styleguide/src/05-02/app/heroes/shared/hero-button/hero-button.component.ts" region="example">
 
   </code-pane>
 
-  <code-pane title="app/app.component.html" path="style-guide/src/05-02/app/app.component.html">
+  <code-pane title="app/app.component.html" path="styleguide/src/05-02/app/app.component.html">
 
   </code-pane>
 
@@ -3774,7 +3774,7 @@ Developers place components on the page as they would native HTML elements and w
 
 
 
-<code-example path="style-guide/src/05-03/app/heroes/shared/hero-button/hero-button.component.avoid.ts" region="example" title="app/heroes/hero-button/hero-button.component.ts">
+<code-example path="styleguide/src/05-03/app/heroes/shared/hero-button/hero-button.component.avoid.ts" region="example" title="app/heroes/hero-button/hero-button.component.ts">
 
 </code-example>
 
@@ -3782,7 +3782,7 @@ Developers place components on the page as they would native HTML elements and w
 
 
 
-<code-example path="style-guide/src/05-03/app/app.component.avoid.html" title="app/app.component.html">
+<code-example path="styleguide/src/05-03/app/app.component.avoid.html" title="app/app.component.html">
 
 </code-example>
 
@@ -3792,11 +3792,11 @@ Developers place components on the page as they would native HTML elements and w
 
 <code-tabs>
 
-  <code-pane title="app/heroes/shared/hero-button/hero-button.component.ts" path="style-guide/src/05-03/app/heroes/shared/hero-button/hero-button.component.ts" region="example">
+  <code-pane title="app/heroes/shared/hero-button/hero-button.component.ts" path="styleguide/src/05-03/app/heroes/shared/hero-button/hero-button.component.ts" region="example">
 
   </code-pane>
 
-  <code-pane title="app/app.component.html" path="style-guide/src/05-03/app/app.component.html">
+  <code-pane title="app/app.component.html" path="styleguide/src/05-03/app/app.component.html">
 
   </code-pane>
 
@@ -3903,7 +3903,7 @@ in those editors that support it; it won't help with CSS styles.
 
 
 
-<code-example path="style-guide/src/05-04/app/heroes/heroes.component.avoid.ts" region="example" title="app/heroes/heroes.component.ts">
+<code-example path="styleguide/src/05-04/app/heroes/heroes.component.avoid.ts" region="example" title="app/heroes/heroes.component.ts">
 
 </code-example>
 
@@ -3913,15 +3913,15 @@ in those editors that support it; it won't help with CSS styles.
 
 <code-tabs>
 
-  <code-pane title="app/heroes/heroes.component.ts" path="style-guide/src/05-04/app/heroes/heroes.component.ts" region="example">
+  <code-pane title="app/heroes/heroes.component.ts" path="styleguide/src/05-04/app/heroes/heroes.component.ts" region="example">
 
   </code-pane>
 
-  <code-pane title="app/heroes/heroes.component.html" path="style-guide/src/05-04/app/heroes/heroes.component.html">
+  <code-pane title="app/heroes/heroes.component.html" path="styleguide/src/05-04/app/heroes/heroes.component.html">
 
   </code-pane>
 
-  <code-pane title="app/heroes/heroes.component.css" path="style-guide/src/05-04/app/heroes/heroes.component.css">
+  <code-pane title="app/heroes/heroes.component.css" path="styleguide/src/05-04/app/heroes/heroes.component.css">
 
   </code-pane>
 
@@ -4006,7 +4006,7 @@ Put it on the line above when doing so is clearly more readable.
 
 
 
-<code-example path="style-guide/src/05-12/app/heroes/shared/hero-button/hero-button.component.avoid.ts" region="example" title="app/heroes/shared/hero-button/hero-button.component.ts">
+<code-example path="styleguide/src/05-12/app/heroes/shared/hero-button/hero-button.component.avoid.ts" region="example" title="app/heroes/shared/hero-button/hero-button.component.ts">
 
 </code-example>
 
@@ -4014,7 +4014,7 @@ Put it on the line above when doing so is clearly more readable.
 
 
 
-<code-example path="style-guide/src/05-12/app/heroes/shared/hero-button/hero-button.component.ts" region="example" title="app/heroes/shared/hero-button/hero-button.component.ts">
+<code-example path="styleguide/src/05-12/app/heroes/shared/hero-button/hero-button.component.ts" region="example" title="app/heroes/shared/hero-button/hero-button.component.ts">
 
 </code-example>
 
@@ -4062,7 +4062,7 @@ and the directive name doesn't describe the property.
 
 
 
-<code-example path="style-guide/src/05-13/app/heroes/shared/hero-button/hero-button.component.avoid.ts" region="example" title="app/heroes/shared/hero-button/hero-button.component.ts">
+<code-example path="styleguide/src/05-13/app/heroes/shared/hero-button/hero-button.component.avoid.ts" region="example" title="app/heroes/shared/hero-button/hero-button.component.ts">
 
 </code-example>
 
@@ -4070,7 +4070,7 @@ and the directive name doesn't describe the property.
 
 
 
-<code-example path="style-guide/src/05-13/app/app.component.avoid.html" title="app/app.component.html">
+<code-example path="styleguide/src/05-13/app/app.component.avoid.html" title="app/app.component.html">
 
 </code-example>
 
@@ -4080,15 +4080,15 @@ and the directive name doesn't describe the property.
 
 <code-tabs>
 
-  <code-pane title="app/heroes/shared/hero-button/hero-button.component.ts" path="style-guide/src/05-13/app/heroes/shared/hero-button/hero-button.component.ts" region="example">
+  <code-pane title="app/heroes/shared/hero-button/hero-button.component.ts" path="styleguide/src/05-13/app/heroes/shared/hero-button/hero-button.component.ts" region="example">
 
   </code-pane>
 
-  <code-pane title="app/heroes/shared/hero-button/hero-highlight.directive.ts" path="style-guide/src/05-13/app/heroes/shared/hero-highlight.directive.ts">
+  <code-pane title="app/heroes/shared/hero-button/hero-highlight.directive.ts" path="styleguide/src/05-13/app/heroes/shared/hero-highlight.directive.ts">
 
   </code-pane>
 
-  <code-pane title="app/app.component.html" path="style-guide/src/05-13/app/app.component.html">
+  <code-pane title="app/app.component.html" path="styleguide/src/05-13/app/app.component.html">
 
   </code-pane>
 
@@ -4138,7 +4138,7 @@ helps instantly identify which members of the component serve which purpose.
 
 
 
-<code-example path="style-guide/src/05-14/app/shared/toast/toast.component.avoid.ts" region="example" title="app/shared/toast/toast.component.ts">
+<code-example path="styleguide/src/05-14/app/shared/toast/toast.component.avoid.ts" region="example" title="app/shared/toast/toast.component.ts">
 
 </code-example>
 
@@ -4146,7 +4146,7 @@ helps instantly identify which members of the component serve which purpose.
 
 
 
-<code-example path="style-guide/src/05-14/app/shared/toast/toast.component.ts" region="example" title="app/shared/toast/toast.component.ts">
+<code-example path="styleguide/src/05-14/app/shared/toast/toast.component.ts" region="example" title="app/shared/toast/toast.component.ts">
 
 </code-example>
 
@@ -4226,7 +4226,7 @@ helps instantly identify which members of the component serve which purpose.
 
 
 
-<code-example path="style-guide/src/05-15/app/heroes/hero-list/hero-list.component.avoid.ts" title="app/heroes/hero-list/hero-list.component.ts">
+<code-example path="styleguide/src/05-15/app/heroes/hero-list/hero-list.component.avoid.ts" title="app/heroes/hero-list/hero-list.component.ts">
 
 </code-example>
 
@@ -4234,7 +4234,7 @@ helps instantly identify which members of the component serve which purpose.
 
 
 
-<code-example path="style-guide/src/05-15/app/heroes/hero-list/hero-list.component.ts" region="example" title="app/heroes/hero-list/hero-list.component.ts">
+<code-example path="styleguide/src/05-15/app/heroes/hero-list/hero-list.component.ts" region="example" title="app/heroes/hero-list/hero-list.component.ts">
 
 </code-example>
 
@@ -4292,7 +4292,7 @@ helps instantly identify which members of the component serve which purpose.
 
 
 
-<code-example path="style-guide/src/05-16/app/heroes/hero.component.avoid.ts" region="example" title="app/heroes/hero.component.ts">
+<code-example path="styleguide/src/05-16/app/heroes/hero.component.avoid.ts" region="example" title="app/heroes/hero.component.ts">
 
 </code-example>
 
@@ -4300,7 +4300,7 @@ helps instantly identify which members of the component serve which purpose.
 
 
 
-<code-example path="style-guide/src/05-16/app/app.component.avoid.html" title="app/app.component.html">
+<code-example path="styleguide/src/05-16/app/app.component.avoid.html" title="app/app.component.html">
 
 </code-example>
 
@@ -4310,11 +4310,11 @@ helps instantly identify which members of the component serve which purpose.
 
 <code-tabs>
 
-  <code-pane title="app/heroes/hero.component.ts" path="style-guide/src/05-16/app/heroes/hero.component.ts" region="example">
+  <code-pane title="app/heroes/hero.component.ts" path="styleguide/src/05-16/app/heroes/hero.component.ts" region="example">
 
   </code-pane>
 
-  <code-pane title="app/app.component.html" path="style-guide/src/05-16/app/app.component.html">
+  <code-pane title="app/app.component.html" path="styleguide/src/05-16/app/app.component.html">
 
   </code-pane>
 
@@ -4363,7 +4363,7 @@ helps instantly identify which members of the component serve which purpose.
 
 
 
-<code-example path="style-guide/src/05-17/app/heroes/hero-list/hero-list.component.avoid.ts" region="example" title="app/heroes/hero-list/hero-list.component.ts">
+<code-example path="styleguide/src/05-17/app/heroes/hero-list/hero-list.component.avoid.ts" region="example" title="app/heroes/hero-list/hero-list.component.ts">
 
 </code-example>
 
@@ -4371,7 +4371,7 @@ helps instantly identify which members of the component serve which purpose.
 
 
 
-<code-example path="style-guide/src/05-17/app/heroes/hero-list/hero-list.component.ts" region="example" title="app/heroes/hero-list/hero-list.component.ts">
+<code-example path="styleguide/src/05-17/app/heroes/hero-list/hero-list.component.ts" region="example" title="app/heroes/hero-list/hero-list.component.ts">
 
 </code-example>
 
@@ -4422,7 +4422,7 @@ helps instantly identify which members of the component serve which purpose.
 
 
 
-<code-example path="style-guide/src/06-01/app/shared/highlight.directive.ts" region="example" title="app/shared/highlight.directive.ts">
+<code-example path="styleguide/src/06-01/app/shared/highlight.directive.ts" region="example" title="app/shared/highlight.directive.ts">
 
 </code-example>
 
@@ -4430,7 +4430,7 @@ helps instantly identify which members of the component serve which purpose.
 
 
 
-<code-example path="style-guide/src/06-01/app/app.component.html" title="app/app.component.html">
+<code-example path="styleguide/src/06-01/app/app.component.html" title="app/app.component.html">
 
 </code-example>
 
@@ -4481,7 +4481,7 @@ and the metadata associated with the directive.
 
 
 
-<code-example path="style-guide/src/06-03/app/shared/validator.directive.ts" title="app/shared/validator.directive.ts">
+<code-example path="styleguide/src/06-03/app/shared/validator.directive.ts" title="app/shared/validator.directive.ts">
 
 </code-example>
 
@@ -4501,7 +4501,7 @@ Compare with the less preferred `host` metadata alternative.
 
 
 
-<code-example path="style-guide/src/06-03/app/shared/validator2.directive.ts" title="app/shared/validator2.directive.ts">
+<code-example path="styleguide/src/06-03/app/shared/validator2.directive.ts" title="app/shared/validator2.directive.ts">
 
 </code-example>
 
@@ -4550,7 +4550,7 @@ Compare with the less preferred `host` metadata alternative.
 
 
 
-<code-example path="style-guide/src/07-01/app/heroes/shared/hero.service.ts" region="example" title="app/heroes/shared/hero.service.ts">
+<code-example path="styleguide/src/07-01/app/heroes/shared/hero.service.ts" region="example" title="app/heroes/shared/hero.service.ts">
 
 </code-example>
 
@@ -4672,11 +4672,11 @@ that instance is shared and available to all child components of that top level
 
 <code-tabs>
 
-  <code-pane title="app/app.component.ts" path="style-guide/src/07-03/app/app.component.ts">
+  <code-pane title="app/app.component.ts" path="styleguide/src/07-03/app/app.component.ts">
 
   </code-pane>
 
-  <code-pane title="app/heroes/hero-list/hero-list.component.ts" path="style-guide/src/07-03/app/heroes/hero-list/hero-list.component.ts">
+  <code-pane title="app/heroes/hero-list/hero-list.component.ts" path="styleguide/src/07-03/app/heroes/hero-list/hero-list.component.ts">
 
   </code-pane>
 
@@ -4726,7 +4726,7 @@ dependencies based on the declared types of that service's constructor parameter
 
 
 
-<code-example path="style-guide/src/07-04/app/heroes/shared/hero-arena.service.avoid.ts" region="example" title="app/heroes/shared/hero-arena.service.ts">
+<code-example path="styleguide/src/07-04/app/heroes/shared/hero-arena.service.avoid.ts" region="example" title="app/heroes/shared/hero-arena.service.ts">
 
 </code-example>
 
@@ -4734,7 +4734,7 @@ dependencies based on the declared types of that service's constructor parameter
 
 
 
-<code-example path="style-guide/src/07-04/app/heroes/shared/hero-arena.service.ts" region="example" title="app/heroes/shared/hero-arena.service.ts">
+<code-example path="styleguide/src/07-04/app/heroes/shared/hero-arena.service.ts" region="example" title="app/heroes/shared/hero-arena.service.ts">
 
 </code-example>
 
@@ -4846,7 +4846,7 @@ signatures. use those signatures to flag spelling and syntax mistakes.
 
 
 
-<code-example path="style-guide/src/09-01/app/heroes/shared/hero-button/hero-button.component.avoid.ts" region="example" title="app/heroes/shared/hero-button/hero-button.component.ts">
+<code-example path="styleguide/src/09-01/app/heroes/shared/hero-button/hero-button.component.avoid.ts" region="example" title="app/heroes/shared/hero-button/hero-button.component.ts">
 
 </code-example>
 
@@ -4854,7 +4854,7 @@ signatures. use those signatures to flag spelling and syntax mistakes.
 
 
 
-<code-example path="style-guide/src/09-01/app/heroes/shared/hero-button/hero-button.component.ts" region="example" title="app/heroes/shared/hero-button/hero-button.component.ts">
+<code-example path="styleguide/src/09-01/app/heroes/shared/hero-button/hero-button.component.ts" region="example" title="app/heroes/shared/hero-button/hero-button.component.ts">
 
 </code-example>
 
diff --git a/aio/content/guide/additional.md b/aio/content/guide/techniques.md
similarity index 100%
rename from aio/content/guide/additional.md
rename to aio/content/guide/techniques.md
diff --git a/aio/content/guide/ts-to-js.md b/aio/content/guide/ts-to-js.md
index e27b07e77c..3d6667cfc8 100644
--- a/aio/content/guide/ts-to-js.md
+++ b/aio/content/guide/ts-to-js.md
@@ -34,7 +34,7 @@ can read and write Angular apps in their preferred dialect.
 * [View and Child Decorators](guide/ts-to-js#view-child-decorators)<br>
 * [AOT compilation in _TypeScript_ Only](guide/ts-to-js#aot)<br>
 
-**Run and compare the live <live-example name="cb-ts-to-js/ts">TypeScript</live-example> and <live-example name="cb-ts-to-js/js">JavaScript</live-example>
+**Run and compare the live <live-example name="ts-to-js/ts">TypeScript</live-example> and <live-example name="ts-to-js/js">JavaScript</live-example>
 code shown in this cookbook.**
 
 
@@ -97,19 +97,19 @@ Anything you can import from `@angular` is a nested member of this `ng` object:
 
 <code-tabs>
 
-  <code-pane title="TypeScript" path="cb-ts-to-js/ts/src/app/app.module.ts" region="ng2import">
+  <code-pane title="TypeScript" path="ts-to-js/ts/src/app/app.module.ts" region="ng2import">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript with decorators" path="cb-ts-to-js/js-es6-decorators/src/app/app.module.es6" region="ng2import">
+  <code-pane title="ES6 JavaScript with decorators" path="ts-to-js/js-es6-decorators/src/app/app.module.es6" region="ng2import">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript" path="cb-ts-to-js/js-es6/src/app/app.module.es6" region="ng2import">
+  <code-pane title="ES6 JavaScript" path="ts-to-js/js-es6/src/app/app.module.es6" region="ng2import">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript" path="cb-ts-to-js/js/src/app/app.module.js" region="ng2import">
+  <code-pane title="ES5 JavaScript" path="ts-to-js/js/src/app/app.module.js" region="ng2import">
 
   </code-pane>
 
@@ -151,19 +151,19 @@ Here is a `HeroComponent` as it might be defined and "exported" in each of the f
 
 <code-tabs>
 
-  <code-pane title="TypeScript" path="cb-ts-to-js/ts/src/app/hero.component.ts" region="appexport">
+  <code-pane title="TypeScript" path="ts-to-js/ts/src/app/hero.component.ts" region="appexport">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript with decorators" path="cb-ts-to-js/js-es6-decorators/src/app/hero.component.es6" region="appexport">
+  <code-pane title="ES6 JavaScript with decorators" path="ts-to-js/js-es6-decorators/src/app/hero.component.es6" region="appexport">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript" path="cb-ts-to-js/js-es6/src/app/hero.component.es6" region="appexport">
+  <code-pane title="ES6 JavaScript" path="ts-to-js/js-es6/src/app/hero.component.es6" region="appexport">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript" path="cb-ts-to-js/js/src/app/hero.component.js" region="appexport">
+  <code-pane title="ES5 JavaScript" path="ts-to-js/js/src/app/hero.component.js" region="appexport">
 
   </code-pane>
 
@@ -180,19 +180,19 @@ In _ES5_ you use the shared namespace object to access "exported" entities from
 
 <code-tabs>
 
-  <code-pane title="TypeScript" path="cb-ts-to-js/ts/src/app/app.module.ts" region="appimport">
+  <code-pane title="TypeScript" path="ts-to-js/ts/src/app/app.module.ts" region="appimport">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript with decorators" path="cb-ts-to-js/js-es6-decorators/src/app/app.module.es6" region="appimport">
+  <code-pane title="ES6 JavaScript with decorators" path="ts-to-js/js-es6-decorators/src/app/app.module.es6" region="appimport">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript" path="cb-ts-to-js/js-es6/src/app/app.module.es6" region="appimport">
+  <code-pane title="ES6 JavaScript" path="ts-to-js/js-es6/src/app/app.module.es6" region="appimport">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript" path="cb-ts-to-js/js/src/app/app.module.js" region="appimport">
+  <code-pane title="ES5 JavaScript" path="ts-to-js/js/src/app/app.module.js" region="appimport">
 
   </code-pane>
 
@@ -246,19 +246,19 @@ Use the constructor function pattern instead, adding methods to the prototype.
 
 <code-tabs>
 
-  <code-pane title="TypeScript" path="cb-ts-to-js/ts/src/app/hero.component.ts" region="class">
+  <code-pane title="TypeScript" path="ts-to-js/ts/src/app/hero.component.ts" region="class">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript with decorators" path="cb-ts-to-js/js-es6-decorators/src/app/hero.component.es6" region="class">
+  <code-pane title="ES6 JavaScript with decorators" path="ts-to-js/js-es6-decorators/src/app/hero.component.es6" region="class">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript" path="cb-ts-to-js/js-es6/src/app/hero.component.es6" region="class">
+  <code-pane title="ES6 JavaScript" path="ts-to-js/js-es6/src/app/hero.component.es6" region="class">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript" path="cb-ts-to-js/js/src/app/hero.component.js" region="constructorproto">
+  <code-pane title="ES5 JavaScript" path="ts-to-js/js/src/app/hero.component.js" region="constructorproto">
 
   </code-pane>
 
@@ -284,19 +284,19 @@ See these variations side-by-side:
 
 <code-tabs>
 
-  <code-pane title="TypeScript" path="cb-ts-to-js/ts/src/app/hero.component.ts" region="metadata">
+  <code-pane title="TypeScript" path="ts-to-js/ts/src/app/hero.component.ts" region="metadata">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript with decorators" path="cb-ts-to-js/js-es6-decorators/src/app/hero.component.es6" region="metadata">
+  <code-pane title="ES6 JavaScript with decorators" path="ts-to-js/js-es6-decorators/src/app/hero.component.es6" region="metadata">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript" path="cb-ts-to-js/js-es6/src/app/hero.component.es6" region="metadata">
+  <code-pane title="ES6 JavaScript" path="ts-to-js/js-es6/src/app/hero.component.es6" region="metadata">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript" path="cb-ts-to-js/js/src/app/hero.component.js" region="metadata">
+  <code-pane title="ES5 JavaScript" path="ts-to-js/js/src/app/hero.component.js" region="metadata">
 
   </code-pane>
 
@@ -308,7 +308,7 @@ See these variations side-by-side:
 
 A large component template is often kept in a separate template file.
 
-<code-example path="cb-ts-to-js/ts/src/app/hero-title.component.html" title="src/app/hero-title.component.html" linenums="false">
+<code-example path="ts-to-js/ts/src/app/hero-title.component.html" title="src/app/hero-title.component.html" linenums="false">
 
 </code-example>
 
@@ -318,19 +318,19 @@ The component (`HeroTitleComponent` in this case) then references the template f
 
 <code-tabs>
 
-  <code-pane title="TypeScript" path="cb-ts-to-js/ts/src/app/hero-title.component.ts" region="templateUrl">
+  <code-pane title="TypeScript" path="ts-to-js/ts/src/app/hero-title.component.ts" region="templateUrl">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript with decorators" path="cb-ts-to-js/js-es6-decorators/src/app/hero-title.component.es6" region="templateUrl">
+  <code-pane title="ES6 JavaScript with decorators" path="ts-to-js/js-es6-decorators/src/app/hero-title.component.es6" region="templateUrl">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript" path="cb-ts-to-js/js-es6/src/app/hero-title.component.es6" region="templateUrl">
+  <code-pane title="ES6 JavaScript" path="ts-to-js/js-es6/src/app/hero-title.component.es6" region="templateUrl">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript" path="cb-ts-to-js/js/src/app/hero-title.component.js" region="templateUrl">
+  <code-pane title="ES5 JavaScript" path="ts-to-js/js/src/app/hero-title.component.js" region="templateUrl">
 
   </code-pane>
 
@@ -363,11 +363,11 @@ next to the original _ES5_ version for comparison:
 
 <code-tabs>
 
-  <code-pane title="ES5 JavaScript with DSL" path="cb-ts-to-js/js/src/app/hero.component.js" region="dsl">
+  <code-pane title="ES5 JavaScript with DSL" path="ts-to-js/js/src/app/hero.component.js" region="dsl">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript" path="cb-ts-to-js/js/src/app/hero.component.js">
+  <code-pane title="ES5 JavaScript" path="ts-to-js/js/src/app/hero.component.js">
 
   </code-pane>
 
@@ -401,7 +401,7 @@ _TypeScript_ and _ES6_ support with getters and setters.
 Here's an example of a read-only _TypeScript_ property with a getter
 that prepares a toggle-button label for the next clicked state:
 
-<code-example path="cb-ts-to-js/ts/src/app/hero-queries.component.ts" region="defined-property" title="ts/src/app/hero-queries.component.ts" linenums="false">
+<code-example path="ts-to-js/ts/src/app/hero-queries.component.ts" region="defined-property" title="ts/src/app/hero-queries.component.ts" linenums="false">
 
 </code-example>
 
@@ -414,7 +414,7 @@ The _ES5 DSL_ does not support _defined properties_ directly
 but you can still create them by extracting the "class" prototype and
 adding the _defined property_ in raw JavaScript like this:
 
-<code-example path="cb-ts-to-js/js/src/app/hero-queries.component.js" region="defined-property" title="js/src/app/hero-queries.component.ts" linenums="false">
+<code-example path="ts-to-js/js/src/app/hero-queries.component.js" region="defined-property" title="js/src/app/hero-queries.component.ts" linenums="false">
 
 </code-example>
 
@@ -466,23 +466,23 @@ Just implement the methods and ignore interfaces when translating code samples f
 
 <code-tabs>
 
-  <code-pane title="TypeScript" path="cb-ts-to-js/ts/src/app/hero-lifecycle.component.ts">
+  <code-pane title="TypeScript" path="ts-to-js/ts/src/app/hero-lifecycle.component.ts">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript with decorators" path="cb-ts-to-js/js-es6-decorators/src/app/hero-lifecycle.component.es6">
+  <code-pane title="ES6 JavaScript with decorators" path="ts-to-js/js-es6-decorators/src/app/hero-lifecycle.component.es6">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript" path="cb-ts-to-js/js-es6/src/app/hero-lifecycle.component.es6">
+  <code-pane title="ES6 JavaScript" path="ts-to-js/js-es6/src/app/hero-lifecycle.component.es6">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript" path="cb-ts-to-js/js/src/app/hero-lifecycle.component.js">
+  <code-pane title="ES5 JavaScript" path="ts-to-js/js/src/app/hero-lifecycle.component.js">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript with DSL" path="cb-ts-to-js/js/src/app/hero-lifecycle.component.js" region="dsl">
+  <code-pane title="ES5 JavaScript with DSL" path="ts-to-js/js/src/app/hero-lifecycle.component.js" region="dsl">
 
   </code-pane>
 
@@ -514,23 +514,23 @@ combined in the metadata `inputs` and `outputs` _arrays_.
 
 <code-tabs>
 
-  <code-pane title="TypeScript" path="cb-ts-to-js/ts/src/app/confirm.component.ts">
+  <code-pane title="TypeScript" path="ts-to-js/ts/src/app/confirm.component.ts">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript with decorators" path="cb-ts-to-js/js-es6-decorators/src/app/confirm.component.es6">
+  <code-pane title="ES6 JavaScript with decorators" path="ts-to-js/js-es6-decorators/src/app/confirm.component.es6">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript" path="cb-ts-to-js/js-es6/src/app/confirm.component.es6">
+  <code-pane title="ES6 JavaScript" path="ts-to-js/js-es6/src/app/confirm.component.es6">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript" path="cb-ts-to-js/js/src/app/confirm.component.js">
+  <code-pane title="ES5 JavaScript" path="ts-to-js/js/src/app/confirm.component.js">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript with DSL" path="cb-ts-to-js/js/src/app/confirm.component.js" region="dsl">
+  <code-pane title="ES5 JavaScript with DSL" path="ts-to-js/js/src/app/confirm.component.js" region="dsl">
 
   </code-pane>
 
@@ -585,23 +585,23 @@ This format should be familiar to AngularJS developers.
 
 <code-tabs>
 
-  <code-pane title="TypeScript" path="cb-ts-to-js/ts/src/app/hero-di.component.ts">
+  <code-pane title="TypeScript" path="ts-to-js/ts/src/app/hero-di.component.ts">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript with decorators" path="cb-ts-to-js/js-es6-decorators/src/app/hero-di.component.es6">
+  <code-pane title="ES6 JavaScript with decorators" path="ts-to-js/js-es6-decorators/src/app/hero-di.component.es6">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript" path="cb-ts-to-js/js-es6/src/app/hero-di.component.es6">
+  <code-pane title="ES6 JavaScript" path="ts-to-js/js-es6/src/app/hero-di.component.es6">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript" path="cb-ts-to-js/js/src/app/hero-di.component.js">
+  <code-pane title="ES5 JavaScript" path="ts-to-js/js/src/app/hero-di.component.js">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript with DSL" path="cb-ts-to-js/js/src/app/hero-di.component.js" region="dsl">
+  <code-pane title="ES5 JavaScript with DSL" path="ts-to-js/js/src/app/hero-di.component.js" region="dsl">
 
   </code-pane>
 
@@ -630,23 +630,23 @@ array as before. Create a new instance of `ng.core.Inject(token)` for each param
 
 <code-tabs>
 
-  <code-pane title="TypeScript" path="cb-ts-to-js/ts/src/app/hero-di-inject.component.ts">
+  <code-pane title="TypeScript" path="ts-to-js/ts/src/app/hero-di-inject.component.ts">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript with decorators" path="cb-ts-to-js/js-es6-decorators/src/app/hero-di-inject.component.es6">
+  <code-pane title="ES6 JavaScript with decorators" path="ts-to-js/js-es6-decorators/src/app/hero-di-inject.component.es6">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript" path="cb-ts-to-js/js-es6/src/app/hero-di-inject.component.es6">
+  <code-pane title="ES6 JavaScript" path="ts-to-js/js-es6/src/app/hero-di-inject.component.es6">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript" path="cb-ts-to-js/js/src/app/hero-di-inject.component.js">
+  <code-pane title="ES5 JavaScript" path="ts-to-js/js/src/app/hero-di-inject.component.js">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript with DSL" path="cb-ts-to-js/js/src/app/hero-di-inject.component.js" region="dsl">
+  <code-pane title="ES5 JavaScript with DSL" path="ts-to-js/js/src/app/hero-di-inject.component.js" region="dsl">
 
   </code-pane>
 
@@ -678,23 +678,23 @@ array as before. Use a nested array to define a parameter's complete injection s
 
 <code-tabs>
 
-  <code-pane title="TypeScript" path="cb-ts-to-js/ts/src/app/hero-title.component.ts">
+  <code-pane title="TypeScript" path="ts-to-js/ts/src/app/hero-title.component.ts">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript with decorators" path="cb-ts-to-js/js-es6-decorators/src/app/hero-title.component.es6">
+  <code-pane title="ES6 JavaScript with decorators" path="ts-to-js/js-es6-decorators/src/app/hero-title.component.es6">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript" path="cb-ts-to-js/js-es6/src/app/hero-title.component.es6">
+  <code-pane title="ES6 JavaScript" path="ts-to-js/js-es6/src/app/hero-title.component.es6">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript" path="cb-ts-to-js/js/src/app/hero-title.component.js">
+  <code-pane title="ES5 JavaScript" path="ts-to-js/js/src/app/hero-title.component.js">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript with DSL" path="cb-ts-to-js/js/src/app/hero-title.component.js" region="dsl">
+  <code-pane title="ES5 JavaScript with DSL" path="ts-to-js/js/src/app/hero-title.component.js" region="dsl">
 
   </code-pane>
 
@@ -745,23 +745,23 @@ The  `host` value is an object whose properties are host property and listener b
 
 <code-tabs>
 
-  <code-pane title="TypeScript" path="cb-ts-to-js/ts/src/app/hero-host.component.ts">
+  <code-pane title="TypeScript" path="ts-to-js/ts/src/app/hero-host.component.ts">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript with decorators" path="cb-ts-to-js/js-es6-decorators/src/app/hero-host.component.es6">
+  <code-pane title="ES6 JavaScript with decorators" path="ts-to-js/js-es6-decorators/src/app/hero-host.component.es6">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript" path="cb-ts-to-js/js-es6/src/app/hero-host.component.es6">
+  <code-pane title="ES6 JavaScript" path="ts-to-js/js-es6/src/app/hero-host.component.es6">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript" path="cb-ts-to-js/js/src/app/hero-host.component.js">
+  <code-pane title="ES5 JavaScript" path="ts-to-js/js/src/app/hero-host.component.js">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript with DSL" path="cb-ts-to-js/js/src/app/hero-host.component.js" region="dsl">
+  <code-pane title="ES5 JavaScript with DSL" path="ts-to-js/js/src/app/hero-host.component.js" region="dsl">
 
   </code-pane>
 
@@ -780,11 +780,11 @@ These particular _TypeScript_ and _ES6_ code snippets happen to be identical.
 
 <code-tabs>
 
-  <code-pane title="TypeScript" path="cb-ts-to-js/ts/src/app/hero-host-meta.component.ts">
+  <code-pane title="TypeScript" path="ts-to-js/ts/src/app/hero-host-meta.component.ts">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript with decorators" path="cb-ts-to-js/js-es6-decorators/src/app/hero-host-meta.component.es6">
+  <code-pane title="ES6 JavaScript with decorators" path="ts-to-js/js-es6-decorators/src/app/hero-host-meta.component.es6">
 
   </code-pane>
 
@@ -828,19 +828,19 @@ The `queries` property value is a hash map.
 
 <code-tabs>
 
-  <code-pane title="TypeScript" path="cb-ts-to-js/ts/src/app/hero-queries.component.ts" region="view">
+  <code-pane title="TypeScript" path="ts-to-js/ts/src/app/hero-queries.component.ts" region="view">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript with decorators" path="cb-ts-to-js/js-es6-decorators/src/app/hero-queries.component.es6" region="view">
+  <code-pane title="ES6 JavaScript with decorators" path="ts-to-js/js-es6-decorators/src/app/hero-queries.component.es6" region="view">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript" path="cb-ts-to-js/js-es6/src/app/hero-queries.component.es6" region="view">
+  <code-pane title="ES6 JavaScript" path="ts-to-js/js-es6/src/app/hero-queries.component.es6" region="view">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript with DSL" path="cb-ts-to-js/js/src/app/hero-queries.component.js" region="view">
+  <code-pane title="ES5 JavaScript with DSL" path="ts-to-js/js/src/app/hero-queries.component.js" region="view">
 
   </code-pane>
 
@@ -859,19 +859,19 @@ They can be added in the same way as [`@ViewChild`](api/core/index/ViewChild-dec
 
 <code-tabs>
 
-  <code-pane title="TypeScript" path="cb-ts-to-js/ts/src/app/hero-queries.component.ts" region="content">
+  <code-pane title="TypeScript" path="ts-to-js/ts/src/app/hero-queries.component.ts" region="content">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript with decorators" path="cb-ts-to-js/js-es6-decorators/src/app/hero-queries.component.es6" region="content">
+  <code-pane title="ES6 JavaScript with decorators" path="ts-to-js/js-es6-decorators/src/app/hero-queries.component.es6" region="content">
 
   </code-pane>
 
-  <code-pane title="ES6 JavaScript" path="cb-ts-to-js/js-es6/src/app/hero-queries.component.es6" region="content">
+  <code-pane title="ES6 JavaScript" path="ts-to-js/js-es6/src/app/hero-queries.component.es6" region="content">
 
   </code-pane>
 
-  <code-pane title="ES5 JavaScript with DSL" path="cb-ts-to-js/js/src/app/hero-queries.component.js" region="content">
+  <code-pane title="ES5 JavaScript with DSL" path="ts-to-js/js/src/app/hero-queries.component.js" region="content">
 
   </code-pane>
 
diff --git a/aio/content/guide/upgrade.md b/aio/content/guide/upgrade.md
index d857e7ab57..9b60b69394 100644
--- a/aio/content/guide/upgrade.md
+++ b/aio/content/guide/upgrade.md
@@ -34,7 +34,7 @@ make incremental upgrading seamless.
 
 1. [Preparation](guide/upgrade#preparation)
 
-    1. [Follow the Angular Style Guide](guide/upgrade#follow-the-angular-style-guide)
+    1. [Follow the Angular Style Guide](guide/upgrade#follow-the-angular-styleguide)
     2. [Using a Module Loader](guide/upgrade#using-a-module-loader)
     3. [Migrating to TypeScript](guide/upgrade#migrating-to-typescript)
     4. [Using Component Directives](guide/upgrade#using-component-directives)
@@ -1451,7 +1451,7 @@ In terms of project structure, this is where our work begins:
 This is actually a pretty good starting point. The code uses the AngularJS 1.5
 component API and the organization follows the
 [AngularJS Style Guide](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md),
-which is an important [preparation step](guide/upgrade#following-the-angular-style-guide) before
+which is an important [preparation step](guide/upgrade#following-the-angular-styleguide) before
 a successful upgrade.
 
 * Each component, service, and filter is in its own source file, as per the
diff --git a/aio/content/tutorial/index.md b/aio/content/tutorial/index.md
index 4fff6931da..5c78ef2379 100644
--- a/aio/content/tutorial/index.md
+++ b/aio/content/tutorial/index.md
@@ -29,7 +29,7 @@ Angular can do whatever you need it to do.
 You'll cover a lot of ground at an introductory level, and you'll find many links
 to pages with greater depth.
 
-When you're done with this tutorial, the app will look like this <live-example name="toh-6"></live-example>.
+When you're done with this tutorial, the app will look like this <live-example name="toh-pt6"></live-example>.
 
 
 
diff --git a/aio/content/tutorial/toh-pt3.md b/aio/content/tutorial/toh-pt3.md
index 14a3f7ce92..baee429582 100644
--- a/aio/content/tutorial/toh-pt3.md
+++ b/aio/content/tutorial/toh-pt3.md
@@ -101,7 +101,7 @@ Add a file named `hero-detail.component.ts` to the `app/` folder.
 This file will hold the new `HeroDetailComponent`.
 
 The file and component names follow the standard described in the Angular
-[style guide](guide/style-guide#naming).
+[style guide](guide/styleguide#naming).
 
 * The component _class_ name should be written in _upper camel case_ and end in the word "Component".
 The hero detail component class is `HeroDetailComponent`.
@@ -162,7 +162,7 @@ Add that property to the `HeroDetailComponent` class like this:
 The `hero` property is typed as an instance of `Hero`.
 The `Hero` class is still in the `app.component.ts` file.
 Now there are two components that need to reference the `Hero` class.
-The Angular [style guide](guide/style-guide#rule-of-one "Style guide: rule of one") recommends one class per file anyway.
+The Angular [style guide](guide/styleguide#rule-of-one "Style guide: rule of one") recommends one class per file anyway.
 
 Move the `Hero` class from `app.component.ts` to its own `hero.ts` file.
 
diff --git a/aio/content/tutorial/toh-pt6.md b/aio/content/tutorial/toh-pt6.md
index b6d7bc878b..23765066ce 100644
--- a/aio/content/tutorial/toh-pt6.md
+++ b/aio/content/tutorial/toh-pt6.md
@@ -130,8 +130,8 @@ Don't worry about the details of this backend substitution; you can
 skip it when you have a real web API server.
 
 Read more about the in-memory web API in the
-[Appendix: Tour of Heroes in-memory web api](guide/server-communication#in-mem-web-api)
-section of the [HTTP Client](guide/server-communication#in-mem-web-api) page.
+[Appendix: Tour of Heroes in-memory web api](guide/http#in-mem-web-api)
+section of the [HTTP Client](guide/http#in-mem-web-api) page.
 
 
 </div>
diff --git a/aio/firebase.json b/aio/firebase.json
index e535054d22..4f3b282810 100644
--- a/aio/firebase.json
+++ b/aio/firebase.json
@@ -6,19 +6,20 @@
     "public": "dist",
     "cleanUrls": true,
     "redirects": [
-      // cli-quickstart.html glossary.html, quickstart.html, server-communication.html
+      // cli-quickstart.html glossary.html, quickstart.html, http.html, style-guide.html
       {"type": 301, "source": "/docs/ts/latest/cli-quickstart.html",             "destination": "/guide/cli-quickstart"},
       {"type": 301, "source": "/docs/ts/latest/glossary.html",                   "destination": "/guide/glossary"},
       {"type": 301, "source": "/docs/ts/latest/quickstart.html",                 "destination": "/guide/quickstart"},
       {"type": 301, "source": "/docs/ts/latest/guide/server-communication.html", "destination": "/guide/http"},
+      {"type": 301, "source": "/docs/ts/latest/guide/style-guide.html", "destination": "/guide/styleguide"},
 
       // cookbook, cookbook/, cookbook/index.html
-      {"type": 301, "source": "/docs/ts/latest/cookbook",            "destination": "/guide/cb-index"},
-      {"type": 301, "source": "/docs/ts/latest/cookbook/",           "destination": "/guide/cb-index"},
-      {"type": 301, "source": "/docs/ts/latest/cookbook/index.html", "destination": "/guide/cb-index"},
+      {"type": 301, "source": "/docs/ts/latest/cookbook",            "destination": "/guide/docs"},
+      {"type": 301, "source": "/docs/ts/latest/cookbook/",           "destination": "/guide/docs"},
+      {"type": 301, "source": "/docs/ts/latest/cookbook/index.html", "destination": "/guide/docs"},
 
       // cookbook/dependency-injection.html
-      {"type": 301, "source": "/docs/ts/latest/cookbook/dependency-injection.html", "destination": "/guide/cb-dependency-injection"},
+      {"type": 301, "source": "/docs/ts/latest/cookbook/dependency-injection.html", "destination": "/guide/dependency-injection-in-action"},
 
       // cookbook/*.html
       {"type": 301, "source": "/docs/ts/latest/cookbook/:cookbook.html", "destination": "/guide/:cookbook"},
diff --git a/aio/src/app/embedded/live-example/live-example.component.spec.ts b/aio/src/app/embedded/live-example/live-example.component.spec.ts
index 374ed75f2f..5c01251663 100644
--- a/aio/src/app/embedded/live-example/live-example.component.spec.ts
+++ b/aio/src/app/embedded/live-example/live-example.component.spec.ts
@@ -120,11 +120,11 @@ describe('LiveExampleComponent', () => {
 
     it('should have expected plunker & download hrefs when has example directory (name)', async(() => {
       testPath = '/guide/somewhere';
-      setHostTemplate('<live-example name="toh-1"></live-example>');
+      setHostTemplate('<live-example name="toh-pt1"></live-example>');
       testComponent(() => {
         const hrefs = getHrefs();
-        expect(hrefs[0]).toContain('/toh-1/eplnkr.html');
-        expect(hrefs[1]).toContain('/toh-1/toh-1.zip');
+        expect(hrefs[0]).toContain('/toh-pt1/eplnkr.html');
+        expect(hrefs[1]).toContain('/toh-pt1/toh-pt1.zip');
       });
     }));
 
diff --git a/aio/src/app/embedded/live-example/live-example.component.ts b/aio/src/app/embedded/live-example/live-example.component.ts
index 5d4a9b9918..4879aedd98 100644
--- a/aio/src/app/embedded/live-example/live-example.component.ts
+++ b/aio/src/app/embedded/live-example/live-example.component.ts
@@ -30,13 +30,13 @@ const zipBase = 'content/zips/';
 *   <p>Run <live-example>Try the live example</live-example></p>.
 *   // ~/resources/live-examples/{page}/plnkr.html
 *
-*   <p>Run <live-example name="toh-1">this example</live-example></p>.
-*   // ~/resources/live-examples/toh-1/plnkr.html
+*   <p>Run <live-example name="toh-pt1">this example</live-example></p>.
+*   // ~/resources/live-examples/toh-pt1/plnkr.html
 *
-*   // Link to the default plunker in the toh-1 sample
+*   // Link to the default plunker in the toh-pt1 sample
 *   // The title overrides default ("live example") with "Tour of Heroes - Part 1"
-*   <p>Run <live-example name="toh-1" title="Tour of Heroes - Part 1"></live-example></p>.
-*   // ~/resources/live-examples/toh-1/plnkr.html
+*   <p>Run <live-example name="toh-pt1" title="Tour of Heroes - Part 1"></live-example></p>.
+*   // ~/resources/live-examples/toh-pt1/plnkr.html
 *
 *   <p>Run <live-example plnkr="minimal"></live-example></p>.
 *   // ~/resources/live-examples/{page}/minimal.plnkr.html
@@ -56,8 +56,8 @@ const zipBase = 'content/zips/';
 *   // ~/resources/live-examples/{page}/plnkr.html
 *
 *   // Displays within the document page as an embedded style plunker editor
-*   <live-example name="toh-1" embedded plnkr="minimal" img="toh>Tour of Heroes - Part 1</live-example>
-*   // ~/resources/live-examples/toh-1/minimal.eplnkr.html
+*   <live-example name="toh-pt1" embedded plnkr="minimal" img="toh>Tour of Heroes - Part 1</live-example>
+*   // ~/resources/live-examples/toh-pt1/minimal.eplnkr.html
 */
 @Component({
   selector: 'live-example',
diff --git a/aio/src/assets/images/cookbooks/aot-compiler/toh6-bundle.png b/aio/src/assets/images/cookbooks/aot-compiler/toh-pt6-bundle.png
similarity index 100%
rename from aio/src/assets/images/cookbooks/aot-compiler/toh6-bundle.png
rename to aio/src/assets/images/cookbooks/aot-compiler/toh-pt6-bundle.png
diff --git a/aio/src/testing/nav-map-json-response.ts b/aio/src/testing/nav-map-json-response.ts
index 8fd7fc6762..a55acb6b50 100644
--- a/aio/src/testing/nav-map-json-response.ts
+++ b/aio/src/testing/nav-map-json-response.ts
@@ -26,7 +26,7 @@ export function getTestNavMapResponse(): Response {
           "tooltip": "Introduction to the Tour of Heroes tutorial"
         },
         {
-          "docId": "tutorial/toh-1",
+          "docId": "tutorial/toh-pt1",
           "navTitle": "The Hero Editor",
           "tooltip": "Build a simple hero editor."
         }
diff --git a/aio/tools/examples/run-example-e2e.js b/aio/tools/examples/run-example-e2e.js
index e11310218a..01fdb651df 100644
--- a/aio/tools/examples/run-example-e2e.js
+++ b/aio/tools/examples/run-example-e2e.js
@@ -12,7 +12,7 @@ const PROTRACTOR_CONFIG_FILENAME = path.join(__dirname, './shared/protractor.con
 const SPEC_FILENAME = 'e2e-spec.ts';
 const EXAMPLE_CONFIG_FILENAME = 'example-config.json';
 const IGNORED_EXAMPLES = [
-  'cb-ts-to-js/'
+  'ts-to-js/'
 ];
 
 /**