diff --git a/public/docs/_examples/architecture/dart/lib/hero_list_component.html b/public/docs/_examples/architecture/dart/lib/hero_list_component.html
index 539ef5fdd5..e493e949fb 100644
--- a/public/docs/_examples/architecture/dart/lib/hero_list_component.html
+++ b/public/docs/_examples/architecture/dart/lib/hero_list_component.html
@@ -1,7 +1,7 @@
 <!-- #docregion -->
 <h2>Hero List</h2>
 
-<div *ngFor="#hero of heroes" (click)="selectHero(hero)">
+<div *ngFor="let hero of heroes" (click)="selectHero(hero)">
   {{hero.name}}
 </div>
 
diff --git a/public/docs/_examples/architecture/dart/lib/hero_list_component_1.html b/public/docs/_examples/architecture/dart/lib/hero_list_component_1.html
index 8673962169..7a08bd2f8b 100644
--- a/public/docs/_examples/architecture/dart/lib/hero_list_component_1.html
+++ b/public/docs/_examples/architecture/dart/lib/hero_list_component_1.html
@@ -5,6 +5,6 @@
 <!--#enddocregion binding -->
 
 <!--#docregion structural  -->
-<div *ngFor="#hero of heroes" ...>...</div>
+<div *ngFor="let hero of heroes" ...>...</div>
 <hero-detail *ngIf="selectedHero != null" ...></hero-detail>
 <!--#enddocregion structural -->
diff --git a/public/docs/_examples/architecture/ts/app/hero-list.component.1.html b/public/docs/_examples/architecture/ts/app/hero-list.component.1.html
index 7fbd8f22ac..d4d6b905fa 100644
--- a/public/docs/_examples/architecture/ts/app/hero-list.component.1.html
+++ b/public/docs/_examples/architecture/ts/app/hero-list.component.1.html
@@ -6,7 +6,7 @@
 <!--#enddocregion binding -->
 
 <!--#docregion structural  -->
-<div *ngFor="#hero of heroes"></div>
+<div *ngFor="let hero of heroes"></div>
 <hero-detail *ngIf="selectedHero"></hero-detail>
 
 <!--#enddocregion structural -->
diff --git a/public/docs/_examples/architecture/ts/app/hero-list.component.html b/public/docs/_examples/architecture/ts/app/hero-list.component.html
index a3de7f2950..f3c92b3141 100644
--- a/public/docs/_examples/architecture/ts/app/hero-list.component.html
+++ b/public/docs/_examples/architecture/ts/app/hero-list.component.html
@@ -2,7 +2,7 @@
 <h2>Hero List</h2>
 
 <p><i>Pick a hero from the list</i></p>
-<div *ngFor="#hero of heroes" (click)="selectHero(hero)">
+<div *ngFor="let hero of heroes" (click)="selectHero(hero)">
   {{hero.name}}
 </div>
 
diff --git a/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.component.html b/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.component.html
index e0be283708..9626afd5cb 100644
--- a/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.component.html
+++ b/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.component.html
@@ -75,7 +75,7 @@
 <h3>Movie Titles via local variable</h3>
 <table>
 <!-- #docregion local -->
-<tr *ngFor="#movie of movies">
+<tr *ngFor="let movie of movies">
   <td>{{movie.title}}</td>
 </tr>
 <!-- #enddocregion local -->
@@ -84,7 +84,7 @@
 <h3>Sliced Movies with pipes</h3>
 <table>
 <!-- #docregion slice -->
-<tr *ngFor="#movie of movies | slice:0:2">
+<tr *ngFor="let movie of movies | slice:0:2">
 <!-- #enddocregion slice -->
 
   <!-- #docregion uppercase -->
diff --git a/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/date.pipe.ts b/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/date.pipe.ts
index f9746ceef9..a27f5dc82d 100644
--- a/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/date.pipe.ts
+++ b/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/date.pipe.ts
@@ -5,7 +5,7 @@ import {DatePipe} from 'angular2/common';
 // #docregion date-pipe
 @Pipe({name: 'date', pure: true})
 export class StringSafeDatePipe extends DatePipe {
- transform(value: any, args: any[]): string {
+ transform(value: any, args: string): string {
    value = typeof value === 'string' ?
            Date.parse(value) : value
    return super.transform(value, args);
diff --git a/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/movie-list.component.html b/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/movie-list.component.html
index 59edc28556..91f7f416cd 100644
--- a/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/movie-list.component.html
+++ b/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/movie-list.component.html
@@ -54,7 +54,7 @@
     </thead>
     <tbody>
   <!-- #docregion ngFor -->
-      <tr *ngFor="#movie of movies">
+      <tr *ngFor="let movie of movies">
   <!-- #enddocregion ngFor -->
         <td>
           <img [hidden]="!showImage || !movie.imageurl"
diff --git a/public/docs/_examples/cb-component-communication/ts/app/hero-parent.component.ts b/public/docs/_examples/cb-component-communication/ts/app/hero-parent.component.ts
index 17a2dcc93c..e199852fef 100644
--- a/public/docs/_examples/cb-component-communication/ts/app/hero-parent.component.ts
+++ b/public/docs/_examples/cb-component-communication/ts/app/hero-parent.component.ts
@@ -7,7 +7,7 @@ import {HEROES} from './hero';
   selector: 'hero-parent',
   template: `
     <h2>{{master}} controls {{heroes.length}} heroes</h2>
-    <hero-child *ngFor="#hero of heroes"
+    <hero-child *ngFor="let hero of heroes"
       [hero]="hero"
       [master]="master">
     </hero-child>
diff --git a/public/docs/_examples/cb-component-communication/ts/app/missioncontrol.component.ts b/public/docs/_examples/cb-component-communication/ts/app/missioncontrol.component.ts
index edcb0ae344..40eca25726 100644
--- a/public/docs/_examples/cb-component-communication/ts/app/missioncontrol.component.ts
+++ b/public/docs/_examples/cb-component-communication/ts/app/missioncontrol.component.ts
@@ -8,12 +8,12 @@ import {MissionService}     from './mission.service';
   template: `
     <h2>Mission Control</h2>
     <button (click)="announce()">Announce mission</button>
-    <my-astronaut *ngFor="#astronaut of astronauts"
+    <my-astronaut *ngFor="let astronaut of astronauts"
       [astronaut]="astronaut">
     </my-astronaut>
     <h3>History</h3>
     <ul>
-      <li *ngFor="#event of history">{{event}}</li>
+      <li *ngFor="let event of history">{{event}}</li>
     </ul>
   `,
   directives: [AstronautComponent],
diff --git a/public/docs/_examples/cb-component-communication/ts/app/name-parent.component.ts b/public/docs/_examples/cb-component-communication/ts/app/name-parent.component.ts
index ec99f31675..5eb0d318c5 100644
--- a/public/docs/_examples/cb-component-communication/ts/app/name-parent.component.ts
+++ b/public/docs/_examples/cb-component-communication/ts/app/name-parent.component.ts
@@ -6,7 +6,7 @@ import {NameChildComponent} from './name-child.component';
   selector: 'name-parent',
   template: `
     <h2>Master controls {{names.length}} names</h2>
-    <name-child *ngFor="#name of names"
+    <name-child *ngFor="let name of names"
       [name]="name">
     </name-child>
   `,
diff --git a/public/docs/_examples/cb-component-communication/ts/app/version-child.component.ts b/public/docs/_examples/cb-component-communication/ts/app/version-child.component.ts
index 944c2888f6..17e06f67ba 100644
--- a/public/docs/_examples/cb-component-communication/ts/app/version-child.component.ts
+++ b/public/docs/_examples/cb-component-communication/ts/app/version-child.component.ts
@@ -1,3 +1,4 @@
+/* tslint:disable:forin */
 // #docregion
 import {Component, Input, OnChanges, SimpleChange} from 'angular2/core';
 
@@ -7,7 +8,7 @@ import {Component, Input, OnChanges, SimpleChange} from 'angular2/core';
     <h3>Version {{major}}.{{minor}}</h3>
     <h4>Change log:</h4>
     <ul>
-      <li *ngFor="#change of changeLog">{{change}}</li>
+      <li *ngFor="let change of changeLog">{{change}}</li>
     </ul>
   `
 })
@@ -27,4 +28,4 @@ export class VersionChildComponent implements OnChanges {
     this.changeLog.push(log.join(', '));
   }
 }
-// #enddocregion
\ No newline at end of file
+// #enddocregion
diff --git a/public/docs/_examples/cb-component-communication/ts/app/votetaker.component.ts b/public/docs/_examples/cb-component-communication/ts/app/votetaker.component.ts
index 02aeda9fd9..f6bfd1bbe0 100644
--- a/public/docs/_examples/cb-component-communication/ts/app/votetaker.component.ts
+++ b/public/docs/_examples/cb-component-communication/ts/app/votetaker.component.ts
@@ -7,7 +7,7 @@ import {VoterComponent} from './voter.component';
   template: `
     <h2>Should mankind colonize the Universe?</h2>
     <h3>Agree: {{agreed}}, Disagree: {{disagreed}}</h3>
-    <my-voter *ngFor="#voter of voters"
+    <my-voter *ngFor="let voter of voters"
       [name]="voter"
       (onVoted)="onVoted($event)">
     </my-voter>
@@ -23,4 +23,4 @@ export class VoteTakerComponent {
     agreed ? this.agreed++ : this.disagreed++;
   }
 }
-// #enddocregion
\ No newline at end of file
+// #enddocregion
diff --git a/public/docs/_examples/cb-dependency-injection/ts/app/hero-of-the-month.component.ts b/public/docs/_examples/cb-dependency-injection/ts/app/hero-of-the-month.component.ts
index 02dcae4824..d9426b2b0b 100644
--- a/public/docs/_examples/cb-dependency-injection/ts/app/hero-of-the-month.component.ts
+++ b/public/docs/_examples/cb-dependency-injection/ts/app/hero-of-the-month.component.ts
@@ -30,7 +30,7 @@ const template = `
 
   <p>Logs:</p>
   <div id="logs">
-    <div *ngFor="#log of logs">{{log}}</div>
+    <div *ngFor="let log of logs">{{log}}</div>
   </div>
   `;
 
diff --git a/public/docs/_examples/cb-dependency-injection/ts/app/sorted-heroes.component.ts b/public/docs/_examples/cb-dependency-injection/ts/app/sorted-heroes.component.ts
index 2a45367044..767a3ff935 100644
--- a/public/docs/_examples/cb-dependency-injection/ts/app/sorted-heroes.component.ts
+++ b/public/docs/_examples/cb-dependency-injection/ts/app/sorted-heroes.component.ts
@@ -8,7 +8,7 @@ import {HeroService}       from './hero.service';
 // #docregion heroes-base, injection
 @Component({
   selector: 'unsorted-heroes',
-  template: `<div *ngFor="#hero of heroes">{{hero.name}}</div>`,
+  template: `<div *ngFor="let hero of heroes">{{hero.name}}</div>`,
   providers: [HeroService]
 })
 export class HeroesBaseComponent implements OnInit {
@@ -33,7 +33,7 @@ export class HeroesBaseComponent implements OnInit {
 // #docregion sorted-heroes
 @Component({
   selector: 'sorted-heroes',
-  template: `<div *ngFor="#hero of heroes">{{hero.name}}</div>`,
+  template: `<div *ngFor="let hero of heroes">{{hero.name}}</div>`,
   providers: [HeroService]
 })
 export class SortedHeroesComponent extends HeroesBaseComponent {
diff --git a/public/docs/_examples/cb-dynamic-form/ts/app/dynamic-form-question.component.html b/public/docs/_examples/cb-dynamic-form/ts/app/dynamic-form-question.component.html
index ceb6d8e141..ceb2f41177 100644
--- a/public/docs/_examples/cb-dynamic-form/ts/app/dynamic-form-question.component.html
+++ b/public/docs/_examples/cb-dynamic-form/ts/app/dynamic-form-question.component.html
@@ -8,7 +8,7 @@
             [id]="question.key" [type]="question.type">
 
     <select [id]="question.key" *ngSwitchWhen="'dropdown'" [ngControl]="question.key">
-      <option *ngFor="#opt of question.options" [value]="opt.key">{{opt.value}}</option>
+      <option *ngFor="let opt of question.options" [value]="opt.key">{{opt.value}}</option>
     </select>
 
   </div>
diff --git a/public/docs/_examples/cb-dynamic-form/ts/app/dynamic-form.component.html b/public/docs/_examples/cb-dynamic-form/ts/app/dynamic-form.component.html
index 7cb4b08ce3..e8f14612c9 100644
--- a/public/docs/_examples/cb-dynamic-form/ts/app/dynamic-form.component.html
+++ b/public/docs/_examples/cb-dynamic-form/ts/app/dynamic-form.component.html
@@ -2,7 +2,7 @@
 <div>
   <form (ngSubmit)="onSubmit()" [ngFormModel]="form">
 
-    <div *ngFor="#question of questions" class="form-row">
+    <div *ngFor="let question of questions" class="form-row">
       <df-question [question]="question" [form]="form"></df-question>
     </div>
 
diff --git a/public/docs/_examples/cb-ts-to-js/ts/app/heroes-queries.component.ts b/public/docs/_examples/cb-ts-to-js/ts/app/heroes-queries.component.ts
index a16906266c..2bb82b0c5f 100644
--- a/public/docs/_examples/cb-ts-to-js/ts/app/heroes-queries.component.ts
+++ b/public/docs/_examples/cb-ts-to-js/ts/app/heroes-queries.component.ts
@@ -48,7 +48,7 @@ class HeroComponent {
 @Component({
   selector: 'heroes-queries',
   template: `
-    <hero *ngFor="#hero of heroData"
+    <hero *ngFor="let hero of heroData"
           [hero]="hero">
       <active-label></active-label>
     </hero>
diff --git a/public/docs/_examples/component-styles/ts/app/hero-team.component.ts b/public/docs/_examples/component-styles/ts/app/hero-team.component.ts
index 78885ff1ea..4255bc21b3 100644
--- a/public/docs/_examples/component-styles/ts/app/hero-team.component.ts
+++ b/public/docs/_examples/component-styles/ts/app/hero-team.component.ts
@@ -8,7 +8,7 @@ import {Hero} from './hero';
     <link rel="stylesheet" href="app/hero-team.component.css">
     <h3>Team</h3>
     <ul>
-      <li *ngFor="#member of hero.team">
+      <li *ngFor="let member of hero.team">
         {{member}}
       </li>
     </ul>`
diff --git a/public/docs/_examples/dependency-injection/ts/app/heroes/hero-list.component.1.ts b/public/docs/_examples/dependency-injection/ts/app/heroes/hero-list.component.1.ts
index f82ced305d..193b893687 100644
--- a/public/docs/_examples/dependency-injection/ts/app/heroes/hero-list.component.1.ts
+++ b/public/docs/_examples/dependency-injection/ts/app/heroes/hero-list.component.1.ts
@@ -1,12 +1,11 @@
 // #docregion
 import { Component }   from 'angular2/core';
-import { Hero }        from './hero';
 import { HEROES }      from './mock-heroes';
 
 @Component({
   selector: 'hero-list',
   template: `
-  <div *ngFor="#hero of heroes">
+  <div *ngFor="let hero of heroes">
     {{hero.id}} - {{hero.name}}
   </div>
   `,
diff --git a/public/docs/_examples/dependency-injection/ts/app/heroes/hero-list.component.2.ts b/public/docs/_examples/dependency-injection/ts/app/heroes/hero-list.component.2.ts
index 4c78e6a190..6ccb4fc582 100644
--- a/public/docs/_examples/dependency-injection/ts/app/heroes/hero-list.component.2.ts
+++ b/public/docs/_examples/dependency-injection/ts/app/heroes/hero-list.component.2.ts
@@ -6,7 +6,7 @@ import { HeroService } from './hero.service';
 @Component({
   selector: 'hero-list',
   template: `
-  <div *ngFor="#hero of heroes">
+  <div *ngFor="let hero of heroes">
     {{hero.id}} - {{hero.name}}
   </div>
   `,
@@ -14,9 +14,9 @@ import { HeroService } from './hero.service';
 export class HeroListComponent {
   heroes: Hero[];
 
-  //#docregion ctor
+  // #docregion ctor
   constructor(heroService: HeroService) {
     this.heroes = heroService.getHeroes();
   }
-  //#enddocregion ctor
+  // #enddocregion ctor
 }
diff --git a/public/docs/_examples/dependency-injection/ts/app/heroes/hero-list.component.ts b/public/docs/_examples/dependency-injection/ts/app/heroes/hero-list.component.ts
index b244d6d38c..ede7386818 100644
--- a/public/docs/_examples/dependency-injection/ts/app/heroes/hero-list.component.ts
+++ b/public/docs/_examples/dependency-injection/ts/app/heroes/hero-list.component.ts
@@ -6,7 +6,7 @@ import { HeroService } from './hero.service';
 @Component({
   selector: 'hero-list',
   template: `
-  <div *ngFor="#hero of heroes">
+  <div *ngFor="let hero of heroes">
     {{hero.id}} - {{hero.name}}
     ({{hero.isSecret ? 'secret' : 'public'}})
   </div>
@@ -15,9 +15,9 @@ import { HeroService } from './hero.service';
 export class HeroListComponent {
   heroes: Hero[];
 
-  //#docregion ctor-signature
+  // #docregion ctor-signature
   constructor(heroService: HeroService) {
-  //#enddocregion ctor-signature
+  // #enddocregion ctor-signature
     this.heroes = heroService.getHeroes();
   }
 }
diff --git a/public/docs/_examples/displaying-data/ts/app/app.component.2.ts b/public/docs/_examples/displaying-data/ts/app/app.component.2.ts
index ed30ee0ebc..2a8f1aec40 100644
--- a/public/docs/_examples/displaying-data/ts/app/app.component.2.ts
+++ b/public/docs/_examples/displaying-data/ts/app/app.component.2.ts
@@ -10,7 +10,7 @@ import {Component} from 'angular2/core';
     <p>Heroes:</p>
     <ul>
   // #docregion li-repeater
-      <li *ngFor="#hero of heroes">
+      <li *ngFor="let hero of heroes">
         {{ hero }}
       </li>
   // #enddocregion li-repeater
diff --git a/public/docs/_examples/displaying-data/ts/app/app.component.3.ts b/public/docs/_examples/displaying-data/ts/app/app.component.3.ts
index 79edbfdfae..c14db59410 100644
--- a/public/docs/_examples/displaying-data/ts/app/app.component.3.ts
+++ b/public/docs/_examples/displaying-data/ts/app/app.component.3.ts
@@ -12,7 +12,7 @@ import {Hero} from './hero';
     <h2>My favorite hero is: {{myHero.name}}</h2>
     <p>Heroes:</p>
     <ul>
-      <li *ngFor="#hero of heroes">
+      <li *ngFor="let hero of heroes">
         {{ hero.name }}
       </li>
     </ul>
diff --git a/public/docs/_examples/displaying-data/ts/app/app.component.ts b/public/docs/_examples/displaying-data/ts/app/app.component.ts
index ace957d9b4..dbbb923f50 100644
--- a/public/docs/_examples/displaying-data/ts/app/app.component.ts
+++ b/public/docs/_examples/displaying-data/ts/app/app.component.ts
@@ -12,7 +12,7 @@ import {Hero} from './hero';
   <h2>My favorite hero is: {{myHero.name}}</h2>
   <p>Heroes:</p>
   <ul>
-    <li *ngFor="#hero of heroes">
+    <li *ngFor="let hero of heroes">
       {{ hero.name }}
       </li>
   </ul>
diff --git a/public/docs/_examples/forms/dart/lib/hero_form_component.html b/public/docs/_examples/forms/dart/lib/hero_form_component.html
index 22097f5e33..dd3b91167f 100644
--- a/public/docs/_examples/forms/dart/lib/hero_form_component.html
+++ b/public/docs/_examples/forms/dart/lib/hero_form_component.html
@@ -32,7 +32,7 @@
         <select class="form-control" required
                 [(ngModel)]="model.power"
                 ngControl="power" >
-          <option *ngFor="#p of powers" [value]="p">{{p}}</option>
+          <option *ngFor="let p of powers" [value]="p">{{p}}</option>
         </select>
       </div>
 
diff --git a/public/docs/_examples/forms/dart/lib/hero_form_component_ngcontrol.html b/public/docs/_examples/forms/dart/lib/hero_form_component_ngcontrol.html
index 09ffb3b968..16eee0a1cf 100644
--- a/public/docs/_examples/forms/dart/lib/hero_form_component_ngcontrol.html
+++ b/public/docs/_examples/forms/dart/lib/hero_form_component_ngcontrol.html
@@ -23,7 +23,7 @@
       <select class="form-control" required
               [(ngModel)]="model.power"
               ngControl="power" >
-        <option *ngFor="#p of powers" [value]="p">{{p}}</option>
+        <option *ngFor="let p of powers" [value]="p">{{p}}</option>
       </select>
     </div>
 
diff --git a/public/docs/_examples/forms/dart/lib/hero_form_component_ngmodel2.html b/public/docs/_examples/forms/dart/lib/hero_form_component_ngmodel2.html
index 9b86b3745c..650c974957 100644
--- a/public/docs/_examples/forms/dart/lib/hero_form_component_ngmodel2.html
+++ b/public/docs/_examples/forms/dart/lib/hero_form_component_ngmodel2.html
@@ -20,7 +20,7 @@
       <label for="power">Hero Power</label>
       <select class="form-control" required
               [(ngModel)]="model.power">
-        <option *ngFor="#p of powers" [value]="p">{{p}}</option>
+        <option *ngFor="let p of powers" [value]="p">{{p}}</option>
       </select>
     </div>
 	  <!-- #enddocregion ngModel-2 -->
diff --git a/public/docs/_examples/forms/dart/lib/hero_form_component_ngmodel_ngfor.html b/public/docs/_examples/forms/dart/lib/hero_form_component_ngmodel_ngfor.html
index 111ac2403f..a0b851a09c 100644
--- a/public/docs/_examples/forms/dart/lib/hero_form_component_ngmodel_ngfor.html
+++ b/public/docs/_examples/forms/dart/lib/hero_form_component_ngmodel_ngfor.html
@@ -20,7 +20,7 @@
     <div class="form-group">
       <label for="power">Hero Power</label>
       <select class="form-control" required>
-        <option *ngFor="#p of powers" [value]="p">{{p}}</option>
+        <option *ngFor="let p of powers" [value]="p">{{p}}</option>
       </select>
     </div>
 	  <!-- #enddocregion powers -->
diff --git a/public/docs/_examples/forms/dart/lib/hero_form_component_ngmodelchange.html b/public/docs/_examples/forms/dart/lib/hero_form_component_ngmodelchange.html
index c8ebb80386..96c55b9740 100644
--- a/public/docs/_examples/forms/dart/lib/hero_form_component_ngmodelchange.html
+++ b/public/docs/_examples/forms/dart/lib/hero_form_component_ngmodelchange.html
@@ -22,7 +22,7 @@
       <label for="power">Hero Power</label>
       <select class="form-control" required
               [(ngModel)]="model.power">
-        <option *ngFor="#p of powers" [value]="p">{{p}}</option>
+        <option *ngFor="let p of powers" [value]="p">{{p}}</option>
       </select>
     </div>
 
diff --git a/public/docs/_examples/forms/dart/lib/hero_form_component_spy.html b/public/docs/_examples/forms/dart/lib/hero_form_component_spy.html
index c1f331eed6..4c77cd14ab 100644
--- a/public/docs/_examples/forms/dart/lib/hero_form_component_spy.html
+++ b/public/docs/_examples/forms/dart/lib/hero_form_component_spy.html
@@ -24,7 +24,7 @@
       <select class="form-control" required
               [(ngModel)]="model.power"
               ngControl="power" >
-        <option *ngFor="#p of powers" [value]="p">{{p}}</option>
+        <option *ngFor="let p of powers" [value]="p">{{p}}</option>
       </select>
     </div>
 
diff --git a/public/docs/_examples/forms/js/app/hero-form.component.html b/public/docs/_examples/forms/js/app/hero-form.component.html
index 2e20f638b7..fdf8e08396 100644
--- a/public/docs/_examples/forms/js/app/hero-form.component.html
+++ b/public/docs/_examples/forms/js/app/hero-form.component.html
@@ -32,7 +32,7 @@
        <select class="form-control" required
          [(ngModel)]="model.power"
            ngControl="power" #power="ngForm" >
-         <option *ngFor="#p of powers" [value]="p">{{p}}</option>
+         <option *ngFor="let p of powers" [value]="p">{{p}}</option>
        </select>
        <div [hidden]="power.valid" class="alert alert-danger">
          Power is required
@@ -110,7 +110,7 @@
        <div class="form-group">
          <label for="power">Hero Power</label>
          <select class="form-control" required>
-           <option *ngFor="#p of powers" [value]="p">{{p}}</option>
+           <option *ngFor="let p of powers" [value]="p">{{p}}</option>
          </select>
        </div>
 
@@ -146,7 +146,7 @@
          <label for="power">Hero Power</label>
          <select class="form-control"  required
            [(ngModel)]="model.power" >
-           <option *ngFor="#p of powers" [value]="p">{{p}}</option>
+           <option *ngFor="let p of powers" [value]="p">{{p}}</option>
          </select>
        </div>
 
diff --git a/public/docs/_examples/forms/ts/app/hero-form.component.html b/public/docs/_examples/forms/ts/app/hero-form.component.html
index 3412ceaff2..6fcfc2a7cb 100644
--- a/public/docs/_examples/forms/ts/app/hero-form.component.html
+++ b/public/docs/_examples/forms/ts/app/hero-form.component.html
@@ -34,7 +34,7 @@
         <select class="form-control" required
           [(ngModel)]="model.power"
             ngControl="power" #power="ngForm" >
-          <option *ngFor="#p of powers" [value]="p">{{p}}</option>
+          <option *ngFor="let p of powers" [value]="p">{{p}}</option>
         </select>
         <div [hidden]="power.valid || power.pristine" class="alert alert-danger">
           Power is required
@@ -124,7 +124,7 @@
         <div class="form-group">
           <label for="power">Hero Power</label>
           <select class="form-control" required>
-            <option *ngFor="#p of powers" [value]="p">{{p}}</option>
+            <option *ngFor="let p of powers" [value]="p">{{p}}</option>
           </select>
         </div>
 
@@ -161,7 +161,7 @@
           <label for="power">Hero Power</label>
           <select class="form-control"  required
             [(ngModel)]="model.power" >
-            <option *ngFor="#p of powers" [value]="p">{{p}}</option>
+            <option *ngFor="let p of powers" [value]="p">{{p}}</option>
           </select>
         </div>
 
diff --git a/public/docs/_examples/hierarchical-dependency-injection/ts/app/heroes-list.component.ts b/public/docs/_examples/hierarchical-dependency-injection/ts/app/heroes-list.component.ts
index a2d477710a..67f5de5238 100644
--- a/public/docs/_examples/hierarchical-dependency-injection/ts/app/heroes-list.component.ts
+++ b/public/docs/_examples/hierarchical-dependency-injection/ts/app/heroes-list.component.ts
@@ -11,7 +11,7 @@ import {Hero} from './hero';
   template: `
     <div>
       <ul>
-        <li *ngFor="#editItem of heroes">
+        <li *ngFor="let editItem of heroes">
           <hero-card
             [hidden]="editItem.editing"
             [hero]="editItem.item">
diff --git a/public/docs/_examples/homepage-hello-world/ts/index.1.html b/public/docs/_examples/homepage-hello-world/ts/index.1.html
index 550dc65833..383636ea87 100644
--- a/public/docs/_examples/homepage-hello-world/ts/index.1.html
+++ b/public/docs/_examples/homepage-hello-world/ts/index.1.html
@@ -14,9 +14,9 @@
 
     <script src="https://code.angularjs.org/tools/system.js"></script>
     <script src="https://code.angularjs.org/tools/typescript.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.16/angular2-polyfills.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.16/Rx.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.16/angular2.dev.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.17/angular2-polyfills.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.17/Rx.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.17/angular2.dev.js"></script>
 
     <!-- 2. Configure SystemJS -->
     <script>
diff --git a/public/docs/_examples/homepage-tabs/ts/app/di_demo.ts b/public/docs/_examples/homepage-tabs/ts/app/di_demo.ts
index 96c4751771..f934b8c8e4 100644
--- a/public/docs/_examples/homepage-tabs/ts/app/di_demo.ts
+++ b/public/docs/_examples/homepage-tabs/ts/app/di_demo.ts
@@ -15,7 +15,7 @@ class Detail {
       <template ui-pane title='Overview' active="true">
         You have {{details.length}} details.
       </template>
-      <template *ngFor="#detail of details" ui-pane [title]="detail.title">
+      <template *ngFor="let detail of details" ui-pane [title]="detail.title">
         {{detail.text}} <br><br>
         <button class="btn" (click)="removeDetail(detail)">Remove</button>
       </template>
diff --git a/public/docs/_examples/homepage-tabs/ts/app/ui_tabs.ts b/public/docs/_examples/homepage-tabs/ts/app/ui_tabs.ts
index 63a3e87c54..b98df9044f 100644
--- a/public/docs/_examples/homepage-tabs/ts/app/ui_tabs.ts
+++ b/public/docs/_examples/homepage-tabs/ts/app/ui_tabs.ts
@@ -31,7 +31,7 @@ export class UiPane {
   selector: 'ui-tabs',
   template: `
     <ul class="nav nav-tabs">
-      <li *ngFor="var pane of panes"
+      <li *ngFor="let pane of panes"
           (click)="select(pane)"
           role="presentation" [class.active]="pane.active">
         <a>{{pane.title}}</a>
diff --git a/public/docs/_examples/homepage-tabs/ts/index.1.html b/public/docs/_examples/homepage-tabs/ts/index.1.html
index 5f06ad241a..c2afbc9278 100644
--- a/public/docs/_examples/homepage-tabs/ts/index.1.html
+++ b/public/docs/_examples/homepage-tabs/ts/index.1.html
@@ -15,9 +15,9 @@
 
     <script src="https://code.angularjs.org/tools/system.js"></script>
     <script src="https://code.angularjs.org/tools/typescript.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.16/angular2-polyfills.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.16/Rx.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.16/angular2.dev.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.17/angular2-polyfills.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.17/Rx.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.17/angular2.dev.js"></script>
 
     <!-- 2. Configure SystemJS -->
     <script>
diff --git a/public/docs/_examples/homepage-todo/ts/app/todo_list.ts b/public/docs/_examples/homepage-todo/ts/app/todo_list.ts
index f680832b23..8aba541079 100644
--- a/public/docs/_examples/homepage-todo/ts/app/todo_list.ts
+++ b/public/docs/_examples/homepage-todo/ts/app/todo_list.ts
@@ -12,7 +12,7 @@ import {Todo} from './todo';
   ],
   template: `
     <ul class="list-unstyled">
-      <li *ngFor="#todo of todos">
+      <li *ngFor="let todo of todos">
         <input type="checkbox" [(ngModel)]="todo.done">
         <span class="done-{{todo.done}}">{{todo.text}}</span>
       </li>
diff --git a/public/docs/_examples/homepage-todo/ts/index.1.html b/public/docs/_examples/homepage-todo/ts/index.1.html
index 4961406091..86ed5b3f86 100644
--- a/public/docs/_examples/homepage-todo/ts/index.1.html
+++ b/public/docs/_examples/homepage-todo/ts/index.1.html
@@ -15,9 +15,9 @@
 
     <script src="https://code.angularjs.org/tools/system.js"></script>
     <script src="https://code.angularjs.org/tools/typescript.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.16/angular2-polyfills.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.16/Rx.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.16/angular2.dev.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.17/angular2-polyfills.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.17/Rx.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.17/angular2.dev.js"></script>
 
     <!-- 2. Configure SystemJS -->
     <script>
diff --git a/public/docs/_examples/lifecycle-hooks/ts/app/after-content.component.ts b/public/docs/_examples/lifecycle-hooks/ts/app/after-content.component.ts
index bfc2bd2e4f..2c60bcf757 100644
--- a/public/docs/_examples/lifecycle-hooks/ts/app/after-content.component.ts
+++ b/public/docs/_examples/lifecycle-hooks/ts/app/after-content.component.ts
@@ -95,7 +95,7 @@ export class AfterContentComponent implements  AfterContentChecked, AfterContent
 
     <h4>-- AfterContent Logs --</h4>
     <p><button (click)="reset()">Reset</button></p>
-    <div *ngFor="#msg of logs">{{msg}}</div>
+    <div *ngFor="let msg of logs">{{msg}}</div>
   </div>
   `,
   styles: ['.parent {background: burlywood}'],
diff --git a/public/docs/_examples/lifecycle-hooks/ts/app/after-view.component.ts b/public/docs/_examples/lifecycle-hooks/ts/app/after-view.component.ts
index 0b516ee029..41bdecace3 100644
--- a/public/docs/_examples/lifecycle-hooks/ts/app/after-view.component.ts
+++ b/public/docs/_examples/lifecycle-hooks/ts/app/after-view.component.ts
@@ -97,7 +97,7 @@ export class AfterViewComponent implements  AfterViewChecked, AfterViewInit {
 
     <h4>-- AfterView Logs --</h4>
     <p><button (click)="reset()">Reset</button></p>
-    <div *ngFor="#msg of logs">{{msg}}</div>
+    <div *ngFor="let msg of logs">{{msg}}</div>
   </div>
   `,
   styles: ['.parent {background: burlywood}'],
diff --git a/public/docs/_examples/lifecycle-hooks/ts/app/counter.component.ts b/public/docs/_examples/lifecycle-hooks/ts/app/counter.component.ts
index b17557f091..389472bc97 100644
--- a/public/docs/_examples/lifecycle-hooks/ts/app/counter.component.ts
+++ b/public/docs/_examples/lifecycle-hooks/ts/app/counter.component.ts
@@ -14,7 +14,7 @@ import {LoggerService}  from './logger.service';
     Counter = {{counter}}
 
     <h5>-- Counter Change Log --</h5>
-    <div *ngFor="#chg of changeLog" my-spy>{{chg}}</div>
+    <div *ngFor="let chg of changeLog" my-spy>{{chg}}</div>
   </div>
   `,
   styles: ['.counter {background: LightYellow; padding: 8px; margin-top: 8px}'],
@@ -55,7 +55,7 @@ export class MyCounter implements OnChanges {
     <my-counter [counter]="value"></my-counter>
 
     <h4>-- Spy Lifecycle Hook Log --</h4>
-    <div *ngFor="#msg of spyLog">{{msg}}</div>
+    <div *ngFor="let msg of spyLog">{{msg}}</div>
    </div>
   `,
   styles: ['.parent {background: gold;}'],
diff --git a/public/docs/_examples/lifecycle-hooks/ts/app/do-check.component.ts b/public/docs/_examples/lifecycle-hooks/ts/app/do-check.component.ts
index ba458ce2e5..52cac7b447 100644
--- a/public/docs/_examples/lifecycle-hooks/ts/app/do-check.component.ts
+++ b/public/docs/_examples/lifecycle-hooks/ts/app/do-check.component.ts
@@ -12,7 +12,7 @@ class Hero {
     <p>{{hero.name}} can {{power}}</p>
 
     <h4>-- Change Log --</h4>
-    <div *ngFor="#chg of changeLog">{{chg}}</div>
+    <div *ngFor="let chg of changeLog">{{chg}}</div>
   </div>
   `,
   styles: [
diff --git a/public/docs/_examples/lifecycle-hooks/ts/app/on-changes.component.ts b/public/docs/_examples/lifecycle-hooks/ts/app/on-changes.component.ts
index 6fdae1269b..125fcbcd50 100644
--- a/public/docs/_examples/lifecycle-hooks/ts/app/on-changes.component.ts
+++ b/public/docs/_examples/lifecycle-hooks/ts/app/on-changes.component.ts
@@ -17,7 +17,7 @@ class Hero {
     <p>{{hero.name}} can {{power}}</p>
 
     <h4>-- Change Log --</h4>
-    <div *ngFor="#chg of changeLog">{{chg}}</div>
+    <div *ngFor="let chg of changeLog">{{chg}}</div>
   </div>
   `,
   styles: [
diff --git a/public/docs/_examples/lifecycle-hooks/ts/app/peek-a-boo-parent.component.ts b/public/docs/_examples/lifecycle-hooks/ts/app/peek-a-boo-parent.component.ts
index 7362199eb6..24c3716c50 100644
--- a/public/docs/_examples/lifecycle-hooks/ts/app/peek-a-boo-parent.component.ts
+++ b/public/docs/_examples/lifecycle-hooks/ts/app/peek-a-boo-parent.component.ts
@@ -18,7 +18,7 @@ import {LoggerService}  from './logger.service';
     </peek-a-boo>
 
     <h4>-- Lifecycle Hook Log --</h4>
-    <div *ngFor="#msg of hookLog">{{msg}}</div>
+    <div *ngFor="let msg of hookLog">{{msg}}</div>
   </div>
   `,
   styles: ['.parent {background: moccasin}'],
diff --git a/public/docs/_examples/lifecycle-hooks/ts/app/spy.component.ts b/public/docs/_examples/lifecycle-hooks/ts/app/spy.component.ts
index 6fb97b2935..f20a4a2066 100644
--- a/public/docs/_examples/lifecycle-hooks/ts/app/spy.component.ts
+++ b/public/docs/_examples/lifecycle-hooks/ts/app/spy.component.ts
@@ -16,12 +16,12 @@ import {Spy} from './spy.directive';
       <button (click)="reset()">Reset Heroes</button>
     </p>` +
 // #docregion template
-    `<div *ngFor="#hero of heroes"  my-spy  class="heroes">
+    `<div *ngFor="let hero of heroes"  my-spy  class="heroes">
        {{hero}}
      </div>`
 // #enddocregion template
 + `<h4>-- Spy Lifecycle Hook Log --</h4>
-    <div *ngFor="#msg of spyLog">{{msg}}</div>
+    <div *ngFor="let msg of spyLog">{{msg}}</div>
    </div>
   `,
   styles: [
diff --git a/public/docs/_examples/package.json b/public/docs/_examples/package.json
index b7504c7256..80fc702259 100644
--- a/public/docs/_examples/package.json
+++ b/public/docs/_examples/package.json
@@ -19,14 +19,14 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "angular2": "2.0.0-beta.16",
+    "angular2": "2.0.0-beta.17",
     "systemjs": "0.19.26",
     "es6-shim": "^0.35.0",
     "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.2",
+    "rxjs": "5.0.0-beta.6",
     "zone.js": "^0.6.12",
 
-    "a2-in-memory-web-api": "^0.1.16",
+    "a2-in-memory-web-api": "^0.1.17",
     "bootstrap": "^3.3.6"
   },
   "devDependencies": {
diff --git a/public/docs/_examples/pipes/ts/app/flying-heroes.component.html b/public/docs/_examples/pipes/ts/app/flying-heroes.component.html
index b6beb80fee..c004987503 100644
--- a/public/docs/_examples/pipes/ts/app/flying-heroes.component.html
+++ b/public/docs/_examples/pipes/ts/app/flying-heroes.component.html
@@ -20,7 +20,7 @@ New hero:
 <h4>Heroes who fly (piped)</h4>
 <div id="flyers">
 <!-- #docregion template-flying-heroes -->
-  <div *ngFor="#hero of (heroes | flyingHeroes)">
+  <div *ngFor="let hero of (heroes | flyingHeroes)">
     {{hero.name}}
   </div>
 <!-- #enddocregion template-flying-heroes -->
@@ -30,7 +30,7 @@ New hero:
 <div id="all">
 <!-- #docregion template-1 -->
 <!-- #docregion template-all-heroes -->
-  <div *ngFor="#hero of heroes">
+  <div *ngFor="let hero of heroes">
     {{hero.name}}
   </div>
 <!-- #enddocregion template-all-heroes -->
diff --git a/public/docs/_examples/pipes/ts/app/hero-list.component.ts b/public/docs/_examples/pipes/ts/app/hero-list.component.ts
index 414281e6e6..9be206f6a5 100644
--- a/public/docs/_examples/pipes/ts/app/hero-list.component.ts
+++ b/public/docs/_examples/pipes/ts/app/hero-list.component.ts
@@ -8,7 +8,7 @@ import {FetchJsonPipe} from './fetch-json.pipe';
   template: `
     <h2>Heroes from JSON File</h2>
 
-    <div *ngFor="#hero of ('heroes.json' | fetch) ">
+    <div *ngFor="let hero of ('heroes.json' | fetch) ">
       {{hero.name}}
     </div>
 
diff --git a/public/docs/_examples/quickstart/js/package.1.json b/public/docs/_examples/quickstart/js/package.1.json
index 3ff516cf7b..2292357cb0 100644
--- a/public/docs/_examples/quickstart/js/package.1.json
+++ b/public/docs/_examples/quickstart/js/package.1.json
@@ -7,10 +7,10 @@
   },
   "license": "ISC",
   "dependencies": {
-    "angular2": "2.0.0-beta.16",
+    "angular2": "2.0.0-beta.17",
     "es6-shim": "^0.35.0",
     "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.2",
+    "rxjs": "5.0.0-beta.6",
     "zone.js": "0.6.12"
   },
   "devDependencies": {
diff --git a/public/docs/_examples/quickstart/ts/package.1.json b/public/docs/_examples/quickstart/ts/package.1.json
index 313e95efde..3ef4888c4a 100644
--- a/public/docs/_examples/quickstart/ts/package.1.json
+++ b/public/docs/_examples/quickstart/ts/package.1.json
@@ -11,11 +11,11 @@
   },
   "license": "ISC",
   "dependencies": {
-    "angular2": "2.0.0-beta.16",
+    "angular2": "2.0.0-beta.17",
     "systemjs": "0.19.26",
     "es6-shim": "^0.35.0",
     "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.2",
+    "rxjs": "5.0.0-beta.6",
     "zone.js": "0.6.12"
   },
   "devDependencies": {
diff --git a/public/docs/_examples/quickstart/ts/typings.1.json b/public/docs/_examples/quickstart/ts/typings.1.json
index d6a258cfb6..9d5c20bc92 100644
--- a/public/docs/_examples/quickstart/ts/typings.1.json
+++ b/public/docs/_examples/quickstart/ts/typings.1.json
@@ -1,6 +1,6 @@
 {
   "ambientDependencies": {
-    "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#7de6c3dd94feaeb21f20054b9f30d5dabc5efabd",
-    "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#5c182b9af717f73146399c2485f70f1e2ac0ff2b"
+    "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654",
+    "jasmine": "registry:dt/jasmine#2.2.0+20160412134438"
   }
 }
diff --git a/public/docs/_examples/router/ts/app/crisis-center/crisis-list.component.1.ts b/public/docs/_examples/router/ts/app/crisis-center/crisis-list.component.1.ts
index 96854b910c..e46d49c378 100644
--- a/public/docs/_examples/router/ts/app/crisis-center/crisis-list.component.1.ts
+++ b/public/docs/_examples/router/ts/app/crisis-center/crisis-list.component.1.ts
@@ -9,7 +9,7 @@ import {Router} from 'angular2/router';
   // #docregion template
   template: `
     <ul class="items">
-      <li *ngFor="#crisis of crises"
+      <li *ngFor="let crisis of crises"
         (click)="onSelect(crisis)">
         <span class="badge">{{crisis.id}}</span> {{crisis.name}}
       </li>
diff --git a/public/docs/_examples/router/ts/app/crisis-center/crisis-list.component.ts b/public/docs/_examples/router/ts/app/crisis-center/crisis-list.component.ts
index 8d6dcfca16..0d8ce996d1 100644
--- a/public/docs/_examples/router/ts/app/crisis-center/crisis-list.component.ts
+++ b/public/docs/_examples/router/ts/app/crisis-center/crisis-list.component.ts
@@ -8,7 +8,7 @@ import {Router, RouteParams} from 'angular2/router';
 @Component({
   template: `
     <ul class="items">
-      <li *ngFor="#crisis of crises"
+      <li *ngFor="let crisis of crises"
         [class.selected]="isSelected(crisis)"
         (click)="onSelect(crisis)">
         <span class="badge">{{crisis.id}}</span> {{crisis.name}}
diff --git a/public/docs/_examples/router/ts/app/heroes/hero-list.component.1.ts b/public/docs/_examples/router/ts/app/heroes/hero-list.component.1.ts
index 05ca2ded3e..cefd49bb16 100644
--- a/public/docs/_examples/router/ts/app/heroes/hero-list.component.1.ts
+++ b/public/docs/_examples/router/ts/app/heroes/hero-list.component.1.ts
@@ -11,7 +11,7 @@ import {Router}              from 'angular2/router';
   template: `
     <h2>HEROES</h2>
     <ul class="items">
-      <li *ngFor="#hero of heroes"
+      <li *ngFor="let hero of heroes"
         (click)="onSelect(hero)">
         <span class="badge">{{hero.id}}</span> {{hero.name}}
       </li>
diff --git a/public/docs/_examples/router/ts/app/heroes/hero-list.component.ts b/public/docs/_examples/router/ts/app/heroes/hero-list.component.ts
index 83f628704c..f11a1f1e6c 100644
--- a/public/docs/_examples/router/ts/app/heroes/hero-list.component.ts
+++ b/public/docs/_examples/router/ts/app/heroes/hero-list.component.ts
@@ -13,7 +13,7 @@ import {Router, RouteParams} from 'angular2/router';
   template: `
     <h2>HEROES</h2>
     <ul class="items">
-      <li *ngFor="#hero of heroes"
+      <li *ngFor="let hero of heroes"
         [class.selected]="isSelected(hero)"
         (click)="onSelect(hero)">
         <span class="badge">{{hero.id}}</span> {{hero.name}}
diff --git a/public/docs/_examples/server-communication/ts/app/toh/hero-list.component.html b/public/docs/_examples/server-communication/ts/app/toh/hero-list.component.html
index 22105a6b15..b4fc477851 100644
--- a/public/docs/_examples/server-communication/ts/app/toh/hero-list.component.html
+++ b/public/docs/_examples/server-communication/ts/app/toh/hero-list.component.html
@@ -1,7 +1,7 @@
 <!-- #docregion -->
 <h3>Heroes:</h3>
 <ul>
-  <li *ngFor="#hero of heroes">
+  <li *ngFor="let hero of heroes">
     {{ hero.name }}
   </li>
 </ul>
diff --git a/public/docs/_examples/server-communication/ts/app/wiki/wiki-smart.component.ts b/public/docs/_examples/server-communication/ts/app/wiki/wiki-smart.component.ts
index dad9dacaf6..b1be2993dc 100644
--- a/public/docs/_examples/server-communication/ts/app/wiki/wiki-smart.component.ts
+++ b/public/docs/_examples/server-communication/ts/app/wiki/wiki-smart.component.ts
@@ -17,7 +17,7 @@ import {WikipediaService} from './wikipedia.service';
     <input #term (keyup)="search(term.value)"/>
 
     <ul>
-      <li *ngFor="#item of items | async">{{item}}</li>
+      <li *ngFor="let item of items | async">{{item}}</li>
     </ul>
   `,
   providers:[JSONP_PROVIDERS, WikipediaService]
diff --git a/public/docs/_examples/server-communication/ts/app/wiki/wiki.component.ts b/public/docs/_examples/server-communication/ts/app/wiki/wiki.component.ts
index c6b6e9888a..268415a61f 100644
--- a/public/docs/_examples/server-communication/ts/app/wiki/wiki.component.ts
+++ b/public/docs/_examples/server-communication/ts/app/wiki/wiki.component.ts
@@ -14,7 +14,7 @@ import {WikipediaService} from './wikipedia.service';
     <input #term (keyup)="search(term.value)"/>
     
     <ul>
-      <li *ngFor="#item of items | async">{{item}}</li>
+      <li *ngFor="let item of items | async">{{item}}</li>
     </ul>
   `,
   providers:[JSONP_PROVIDERS, WikipediaService]
diff --git a/public/docs/_examples/structural-directives/dart/lib/structural_directives_component.html b/public/docs/_examples/structural-directives/dart/lib/structural_directives_component.html
index 2ea022222a..7ad7cf2247 100644
--- a/public/docs/_examples/structural-directives/dart/lib/structural_directives_component.html
+++ b/public/docs/_examples/structural-directives/dart/lib/structural_directives_component.html
@@ -5,7 +5,7 @@
 <!-- #docregion structural-directives -->
 <!-- #docregion asterisk -->
 <div *ngIf="hero != null">{{hero}}</div>
-<div *ngFor="#hero of heroes">{{hero}}</div>
+<div *ngFor="let hero of heroes">{{hero}}</div>
 <!-- #enddocregion asterisk -->
 <!-- #docregion ngSwitch -->
 <div [ngSwitch]="status">
@@ -57,7 +57,7 @@
 </div>
 
 <h4>heavy-loader log:</h4>
-<div *ngFor="#message of logs">{{message}}</div>
+<div *ngFor="let message of logs">{{message}}</div>
 <!-- #enddocregion message-log -->
 
 <hr>
@@ -99,10 +99,10 @@
 <!-- Examples (A) and (B) are the same -->
 
 <!-- (A) *ngFor div -->
-<div *ngFor="#hero of heroes">{{ hero }}</div>
+<div *ngFor="let hero of heroes">{{ hero }}</div>
 
 <!-- (B) ngFor with template -->
-<template ngFor #hero [ngForOf]="heroes">
+<template ngFor let-hero [ngForOf]="heroes">
   <div>{{ hero }}</div>
 </template>
 <!-- #enddocregion ngFor-template -->
diff --git a/public/docs/_examples/structural-directives/ts/app/structural-directives.component.html b/public/docs/_examples/structural-directives/ts/app/structural-directives.component.html
index c7aa615932..3599c77271 100644
--- a/public/docs/_examples/structural-directives/ts/app/structural-directives.component.html
+++ b/public/docs/_examples/structural-directives/ts/app/structural-directives.component.html
@@ -5,7 +5,7 @@
 <!-- #docregion structural-directives -->
 <!-- #docregion asterisk -->
 <div *ngIf="hero">{{hero}}</div>
-<div *ngFor="#hero of heroes">{{hero}}</div>
+<div *ngFor="let hero of heroes">{{hero}}</div>
 <!-- #enddocregion asterisk -->
 <!-- #docregion ngSwitch -->
 <div [ngSwitch]="status">
@@ -57,7 +57,7 @@
 </div>
 
 <h4>heavy-loader log:</h4>
-<div *ngFor="#message of logs">{{message}}</div>
+<div *ngFor="let message of logs">{{message}}</div>
 <!-- #enddocregion message-log -->
 
 <hr>
@@ -99,10 +99,10 @@
 <!-- Examples (A) and (B) are the same -->
 
 <!-- (A) *ngFor div -->
-<div *ngFor="#hero of heroes">{{ hero }}</div>
+<div *ngFor="let hero of heroes">{{ hero }}</div>
 
 <!-- (B) ngFor with template -->
-<template ngFor #hero [ngForOf]="heroes">
+<template ngFor let-hero [ngForOf]="heroes">
   <div>{{ hero }}</div>
 </template>
 <!-- #enddocregion ngFor-template -->
diff --git a/public/docs/_examples/style-guide/ts/05-04/app/heroes/heroes.component.avoid.ts b/public/docs/_examples/style-guide/ts/05-04/app/heroes/heroes.component.avoid.ts
index e6641a3de3..45cb60f820 100644
--- a/public/docs/_examples/style-guide/ts/05-04/app/heroes/heroes.component.avoid.ts
+++ b/public/docs/_examples/style-guide/ts/05-04/app/heroes/heroes.component.avoid.ts
@@ -7,7 +7,7 @@
     <div>
       <h2>My Heroes</h2>
       <ul class="heroes">
-        <li *ngFor="#hero of heroes">
+        <li *ngFor="let hero of heroes">
           <span class="badge">{{hero.id}}</span> {{hero.name}}
         </li>
       </ul>
diff --git a/public/docs/_examples/style-guide/ts/05-04/app/heroes/heroes.component.html b/public/docs/_examples/style-guide/ts/05-04/app/heroes/heroes.component.html
index b899229cab..b6bf75ef1a 100644
--- a/public/docs/_examples/style-guide/ts/05-04/app/heroes/heroes.component.html
+++ b/public/docs/_examples/style-guide/ts/05-04/app/heroes/heroes.component.html
@@ -2,7 +2,7 @@
 <div>
   <h2>My Heroes</h2>
   <ul class="heroes">
-    <li *ngFor="#hero of heroes">
+    <li *ngFor="let hero of heroes">
       <span class="badge">{{hero.id}}</span> {{hero.name}}
     </li>
   </ul>
diff --git a/public/docs/_examples/style-guide/ts/05-17/app/heroes/heroes-list.component.avoid.ts b/public/docs/_examples/style-guide/ts/05-17/app/heroes/heroes-list.component.avoid.ts
index 45e1f34e71..0665aec60b 100644
--- a/public/docs/_examples/style-guide/ts/05-17/app/heroes/heroes-list.component.avoid.ts
+++ b/public/docs/_examples/style-guide/ts/05-17/app/heroes/heroes-list.component.avoid.ts
@@ -6,7 +6,7 @@
   template: `
     <section>
       Our list of heroes:
-      <hero-profile *ngFor="#hero of heroes" [hero]="hero">
+      <hero-profile *ngFor="let hero of heroes" [hero]="hero">
       </hero-profile>
       Total powers: {{totalPowers}}<br>
       Average power: {{totalPowers / heroes.length}}
diff --git a/public/docs/_examples/style-guide/ts/05-17/app/heroes/heroes-list.component.ts b/public/docs/_examples/style-guide/ts/05-17/app/heroes/heroes-list.component.ts
index 7e59cf9baa..f66cc4a086 100644
--- a/public/docs/_examples/style-guide/ts/05-17/app/heroes/heroes-list.component.ts
+++ b/public/docs/_examples/style-guide/ts/05-17/app/heroes/heroes-list.component.ts
@@ -9,7 +9,7 @@ import { Hero } from './hero.model.ts';
   template: `
     <section>
       Our list of heroes:
-      <hero-profile *ngFor="#hero of heroes" [hero]="hero">
+      <hero-profile *ngFor="let hero of heroes" [hero]="hero">
       </hero-profile>
       Total powers: {{totalPowers}}<br>
       Average power: {{avgPower}}
diff --git a/public/docs/_examples/template-syntax/dart/lib/app_component.html b/public/docs/_examples/template-syntax/dart/lib/app_component.html
index ba6499c90b..5b97e1c1a9 100644
--- a/public/docs/_examples/template-syntax/dart/lib/app_component.html
+++ b/public/docs/_examples/template-syntax/dart/lib/app_component.html
@@ -523,7 +523,7 @@ bindon-ngModel
 
 <div class="box">
   <!-- #docregion NgFor-1 -->
-  <div *ngFor="#hero of heroes">{{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes">{{hero.fullName}}</div>
   <!-- #enddocregion NgFor-1 -->
 </div>
 <br>
@@ -531,7 +531,7 @@ bindon-ngModel
 <div class="box">
   <!-- *ngFor w/ hero-detail Component -->
   <!-- #docregion NgFor-2 -->
-  <hero-detail *ngFor="#hero of heroes" [hero]="hero"></hero-detail>
+  <hero-detail *ngFor="let hero of heroes" [hero]="hero"></hero-detail>
   <!-- #enddocregion NgFor-2 -->
 </div>
 
@@ -541,14 +541,14 @@ bindon-ngModel
 <p>with <i>semi-colon</i> separator</p>
 <div class="box">
   <!-- #docregion NgFor-3 -->
-  <div *ngFor="#hero of heroes; #i=index">{{i + 1}} - {{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes; let i=index">{{i + 1}} - {{hero.fullName}}</div>
   <!-- #enddocregion NgFor-3 -->
 </div>
 
 <p>with <i>comma</i> separator</p>
 <div class="box">
   <!-- Ex: "1 - Hercules Son of Zeus"" -->
-  <div *ngFor="#hero of heroes, #i=index">{{i + 1}} - {{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes, let i=index">{{i + 1}} - {{hero.fullName}}</div>
 </div>
 
 <a class="to-toc" href="#toc">top</a>
@@ -560,7 +560,7 @@ bindon-ngModel
 <p><i>without</i> trackBy</p>
 <div #noTrackBy class="box">
   <!-- #docregion NgForTrackBy-1 -->
-  <div *ngFor="#hero of heroes">({{hero.id}}) {{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes">({{hero.id}}) {{hero.fullName}}</div>
   <!-- #enddocregion NgForTrackBy-1 -->
 </div>
 <div id="noTrackByCnt" *ngIf="heroesNoTrackByChangeCount != 0" style="background-color:bisque">
@@ -570,7 +570,7 @@ bindon-ngModel
 <p>with trackBy and <i>semi-colon</i> separator</p>
 <div #withTrackBy class="box">
   <!-- #docregion NgForTrackBy-2 -->
-  <div *ngFor="#hero of heroes; trackBy:trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes; trackBy:trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
   <!-- #enddocregion NgForTrackBy-2 -->
 </div>
 <div id="withTrackByCnt" *ngIf="heroesWithTrackByChangeCount != 0" style="background-color:bisque">
@@ -579,25 +579,25 @@ bindon-ngModel
 
 <p>with trackBy and <i>comma</i> separator</p>
 <div class="box">
-  <div *ngFor="#hero of heroes, trackBy:trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes, trackBy:trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
 </div>
 
 <p>with trackBy and <i>space</i> separator</p>
 <div class="box">
-  <div *ngFor="#hero of heroes trackBy:trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes trackBy:trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
 </div>
 
 <p>with <i>*ngForTrackBy</i></p>
 <div class="box">
   <!-- #docregion NgForTrackBy-2 -->
-  <div *ngFor="#hero of heroes" *ngForTrackBy="trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes" *ngForTrackBy="trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
   <!-- #enddocregion NgForTrackBy-2 -->
 </div>
 
 <p>with <i>generic</i> trackById function</p>
 <div class="box">
   <!-- #docregion NgForTrackBy-3 -->
-  <div *ngFor="#hero of heroes" *ngForTrackBy="trackById">({{hero.id}}) {{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes" *ngForTrackBy="trackById">({{hero.id}}) {{hero.fullName}}</div>
   <!-- #enddocregion NgForTrackBy-3 -->
 </div>
 
@@ -628,14 +628,14 @@ bindon-ngModel
 <p><i>*ngFor</i></p>
   <!-- *ngFor w/ hero-detail Component -->
   <!-- #docregion Template-3a -->
-  <hero-detail *ngFor="#hero of heroes; trackBy:trackByHeroes" [hero]="hero"></hero-detail>
+  <hero-detail *ngFor="let hero of heroes; trackBy:trackByHeroes" [hero]="hero"></hero-detail>
   <!-- #enddocregion Template-3a -->
 
 <p><i>expand to template = "..."</i></p>
 <div class="box">
   <!-- *ngFor w/ hero-detail Component and a template "attribute" directive -->
   <!-- #docregion Template-3 -->
-  <hero-detail template="ngFor #hero of heroes; trackBy:trackByHeroes" [hero]="hero"></hero-detail>
+  <hero-detail template="ngFor let hero of heroes; trackBy:trackByHeroes" [hero]="hero"></hero-detail>
   <!-- #enddocregion Template-3 -->
 </div>
 <br>
@@ -644,7 +644,7 @@ bindon-ngModel
 <div class="box">
   <!-- ngFor w/ hero-detail Component inside a template element -->
   <!-- #docregion Template-4 -->
-  <template ngFor #hero [ngForOf]="heroes" [ngForTrackBy]="trackByHeroes">
+  <template ngFor let-hero [ngForOf]="heroes" [ngForTrackBy]="trackByHeroes">
       <hero-detail [hero]="hero"></hero-detail>
   </template>
   <!-- #enddocregion Template-4 -->
diff --git a/public/docs/_examples/template-syntax/ts/app/app.component.html b/public/docs/_examples/template-syntax/ts/app/app.component.html
index 2eca4116e7..528221116d 100644
--- a/public/docs/_examples/template-syntax/ts/app/app.component.html
+++ b/public/docs/_examples/template-syntax/ts/app/app.component.html
@@ -519,7 +519,7 @@ After setClasses(), the classes are "{{classDiv.className}}"
 
 <div class="box">
   <!-- #docregion NgFor-1 -->
-  <div *ngFor="#hero of heroes">{{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes">{{hero.fullName}}</div>
   <!-- #enddocregion NgFor-1 -->
 </div>
 <br>
@@ -527,7 +527,7 @@ After setClasses(), the classes are "{{classDiv.className}}"
 <div class="box">
   <!-- *ngFor w/ hero-detail Component -->
   <!-- #docregion NgFor-2 -->
-  <hero-detail *ngFor="#hero of heroes" [hero]="hero"></hero-detail>
+  <hero-detail *ngFor="let hero of heroes" [hero]="hero"></hero-detail>
   <!-- #enddocregion NgFor-2 -->
 </div>
 
@@ -537,14 +537,14 @@ After setClasses(), the classes are "{{classDiv.className}}"
 <p>with <i>semi-colon</i> separator</p>
 <div class="box">
   <!-- #docregion NgFor-3 -->
-  <div *ngFor="#hero of heroes; #i=index">{{i + 1}} - {{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes; let i=index">{{i + 1}} - {{hero.fullName}}</div>
   <!-- #enddocregion NgFor-3 -->
 </div>
 
 <p>with <i>comma</i> separator</p>
 <div class="box">
   <!-- Ex: "1 - Hercules Son of Zeus"" -->
-  <div *ngFor="#hero of heroes, #i=index">{{i + 1}} - {{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes, let i=index">{{i + 1}} - {{hero.fullName}}</div>
 </div>
 
 <a class="to-toc" href="#toc">top</a>
@@ -556,7 +556,7 @@ After setClasses(), the classes are "{{classDiv.className}}"
 <p><i>without</i> trackBy</p>
 <div #noTrackBy class="box">
   <!-- #docregion NgForTrackBy-1 -->
-  <div *ngFor="#hero of heroes">({{hero.id}}) {{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes">({{hero.id}}) {{hero.fullName}}</div>
   <!-- #enddocregion NgForTrackBy-1 -->
 </div>
 <div id="noTrackByCnt" *ngIf="heroesNoTrackByChangeCount" style="background-color:bisque">
@@ -566,7 +566,7 @@ After setClasses(), the classes are "{{classDiv.className}}"
 <p>with trackBy and <i>semi-colon</i> separator</p>
 <div #withTrackBy class="box">
   <!-- #docregion NgForTrackBy-2 -->
-  <div *ngFor="#hero of heroes; trackBy:trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes; trackBy:trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
   <!-- #enddocregion NgForTrackBy-2 -->
 </div>
 <div id="withTrackByCnt" *ngIf="heroesWithTrackByChangeCount" style="background-color:bisque">
@@ -575,25 +575,25 @@ After setClasses(), the classes are "{{classDiv.className}}"
 
 <p>with trackBy and <i>comma</i> separator</p>
 <div class="box">
-  <div *ngFor="#hero of heroes, trackBy:trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes, trackBy:trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
 </div>
 
 <p>with trackBy and <i>space</i> separator</p>
 <div #withTrackBy class="box">
-  <div *ngFor="#hero of heroes trackBy:trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes trackBy:trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
 </div>
 
 <p>with <i>*ngForTrackBy</i></p>
 <div class="box">
   <!-- #docregion NgForTrackBy-2 -->
-  <div *ngFor="#hero of heroes" *ngForTrackBy="trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes" *ngForTrackBy="trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
   <!-- #enddocregion NgForTrackBy-2 -->
 </div>
 
 <p>with <i>generic</i> trackById function</p>
 <div class="box">
   <!-- #docregion NgForTrackBy-3 -->
-  <div *ngFor="#hero of heroes" *ngForTrackBy="trackById">({{hero.id}}) {{hero.fullName}}</div>
+  <div *ngFor="let hero of heroes" *ngForTrackBy="trackById">({{hero.id}}) {{hero.fullName}}</div>
   <!-- #enddocregion NgForTrackBy-3 -->
 </div>
 
@@ -624,14 +624,14 @@ After setClasses(), the classes are "{{classDiv.className}}"
 <p><i>*ngFor</i></p>
   <!-- *ngFor w/ hero-detail Component -->
   <!-- #docregion Template-3a -->
-  <hero-detail *ngFor="#hero of heroes; trackBy:trackByHeroes" [hero]="hero"></hero-detail>
+  <hero-detail *ngFor="let hero of heroes; trackBy:trackByHeroes" [hero]="hero"></hero-detail>
   <!-- #enddocregion Template-3a -->
 
 <p><i>expand to template = "..."</i></p>
 <div class="box">
   <!-- ngFor w/ hero-detail Component and a template "attribute" directive -->
   <!-- #docregion Template-3 -->
-  <hero-detail template="ngFor #hero of heroes; trackBy:trackByHeroes" [hero]="hero"></hero-detail>
+  <hero-detail template="ngFor let hero of heroes; trackBy:trackByHeroes" [hero]="hero"></hero-detail>
   <!-- #enddocregion Template-3 -->
 </div>
 
@@ -639,7 +639,7 @@ After setClasses(), the classes are "{{classDiv.className}}"
 <div class="box">
   <!-- ngFor w/ hero-detail Component inside a template element -->
   <!-- #docregion Template-4 -->
-  <template ngFor #hero [ngForOf]="heroes" [ngForTrackBy]="trackByHeroes">
+  <template ngFor let-hero [ngForOf]="heroes" [ngForTrackBy]="trackByHeroes">
     <hero-detail [hero]="hero"></hero-detail>
   </template>
   <!-- #enddocregion Template-4 -->
@@ -650,31 +650,31 @@ After setClasses(), the classes are "{{classDiv.className}}"
 <!-- template local variable -->
 <hr><h2 id="local-vars">Template local variables</h2>
 
-<!-- #docregion var-phone -->
+<!-- #docregion ref-phone -->
 <!-- phone refers to the input element; pass its `value` to an event handler -->
 <input #phone placeholder="phone number">
 <button (click)="callPhone(phone.value)">Call</button>
 
 <!-- fax refers to the input element; pass its `value` to an event handler -->
-<input var-fax placeholder="fax number">
+<input ref-fax placeholder="fax number">
 <button (click)="callFax(fax.value)">Fax</button>
-  <!-- #enddocregion var-phone -->
+  <!-- #enddocregion ref-phone -->
 
 <h4>Example Form</h4>
-<!-- #docregion var-form -->
-<!-- #docregion var-form-a -->
+<!-- #docregion ref-form -->
+<!-- #docregion ref-form-a -->
 <form (ngSubmit)="onSubmit(theForm)" #theForm="ngForm">
-<!-- #enddocregion var-form-a -->
+<!-- #enddocregion ref-form-a -->
   <div class="form-group">
     <label for="name">Name</label>
     <input class="form-control" required ngControl="firstName"
       [(ngModel)]="currentHero.firstName">
   </div>
-<!-- #docregion var-form-a -->
+<!-- #docregion ref-form-a -->
   <button type="submit" [disabled]="!theForm.form.valid">Submit</button>
 </form>
-<!-- #enddocregion var-form-a -->
-<!-- #enddocregion var-form -->
+<!-- #enddocregion ref-form-a -->
+<!-- #enddocregion ref-form -->
 <br><br>
 
 <!-- btn refers to the button element; show its disabled state -->
diff --git a/public/docs/_examples/testing/ts/app/bag.ts b/public/docs/_examples/testing/ts/app/bag.ts
index f94f33934d..65a4b4f6be 100644
--- a/public/docs/_examples/testing/ts/app/bag.ts
+++ b/public/docs/_examples/testing/ts/app/bag.ts
@@ -160,7 +160,7 @@ export class BadTemplateUrl { }
       <label>Child value: <input [(ngModel)]="childValue"> </label>
     </div>
     <p><i>Change log:</i></p>
-    <div *ngFor="#log of changeLog; #i=index">{{i + 1}} - {{log}}</div>`
+    <div *ngFor="let log of changeLog; let i=index">{{i + 1}} - {{log}}</div>`
 })
 export class MyIfChildComp implements OnInit, OnChanges, OnDestroy {
   @Input() value = '';
diff --git a/public/docs/_examples/testing/ts/app/dashboard.component.html b/public/docs/_examples/testing/ts/app/dashboard.component.html
index a5bafd7702..028eab6eb3 100644
--- a/public/docs/_examples/testing/ts/app/dashboard.component.html
+++ b/public/docs/_examples/testing/ts/app/dashboard.component.html
@@ -2,7 +2,7 @@
 <h3>Top Heroes</h3>
 <div class="grid grid-pad">
 <!-- #docregion click -->
-  <div *ngFor="#hero of heroes" (click)="gotoDetail(hero)" class="col-1-4">
+  <div *ngFor="let hero of heroes" (click)="gotoDetail(hero)" class="col-1-4">
 <!-- #enddocregion click -->
     <div class="module hero">
       <h4>{{hero.name}}</h4>
diff --git a/public/docs/_examples/testing/ts/app/heroes.component.html b/public/docs/_examples/testing/ts/app/heroes.component.html
index 9bcd2ba4e8..cce1853d30 100644
--- a/public/docs/_examples/testing/ts/app/heroes.component.html
+++ b/public/docs/_examples/testing/ts/app/heroes.component.html
@@ -2,7 +2,7 @@
 <!-- #docregion -->
 <h2>My Heroes</h2>
 <ul class="heroes">
-  <li *ngFor="#hero of heroes"
+  <li *ngFor="let hero of heroes"
     [class.selected]="hero === selectedHero"
     (click)="onSelect(hero)">
     <span class="badge">{{hero.id}}</span> {{hero.name}}
diff --git a/public/docs/_examples/toh-2/ts-snippets/app.component.snippets.pt2.ts b/public/docs/_examples/toh-2/ts-snippets/app.component.snippets.pt2.ts
index 9dc0277fc4..10475a0954 100644
--- a/public/docs/_examples/toh-2/ts-snippets/app.component.snippets.pt2.ts
+++ b/public/docs/_examples/toh-2/ts-snippets/app.component.snippets.pt2.ts
@@ -1,5 +1,5 @@
 // #docregion ng-for
-<li *ngFor="#hero of heroes">
+<li *ngFor="let hero of heroes">
   <span class="badge">{{hero.id}}</span> {{hero.name}}
 </li>
 // #enddocregion ng-for
@@ -7,14 +7,14 @@
 // #docregion heroes-styled
 <h2>My Heroes</h2>
 <ul class="heroes">
-  <li *ngFor="#hero of heroes">
+  <li *ngFor="let hero of heroes">
     <span class="badge">{{hero.id}}</span> {{hero.name}}
   </li>
 </ul>
 // #enddocregion heroes-styled
 
 // #docregion selectedHero-click
-<li *ngFor="#hero of heroes" (click)="onSelect(hero)">
+<li *ngFor="let hero of heroes" (click)="onSelect(hero)">
   <span class="badge">{{hero.id}}</span> {{hero.name}}
 </li>
 // #enddocregion selectedHero-click
@@ -53,7 +53,7 @@ public heroes = HEROES;
 // #enddocregion heroes-template-1
 
 // #docregion heroes-ngfor-1
-<li *ngFor="#hero of heroes">
+<li *ngFor="let hero of heroes">
 // #enddocregion heroes-ngfor-1
 
 // #docregion class-selected-1
@@ -61,7 +61,7 @@ public heroes = HEROES;
 // #enddocregion class-selected-1
 
 // #docregion class-selected-2
-<li *ngFor="#hero of heroes"
+<li *ngFor="let hero of heroes"
   [class.selected]="hero === selectedHero"
   (click)="onSelect(hero)">
   <span class="badge">{{hero.id}}</span> {{hero.name}}
diff --git a/public/docs/_examples/toh-2/ts/app/app.component.ts b/public/docs/_examples/toh-2/ts/app/app.component.ts
index cb1c1e918f..67f6ffb992 100644
--- a/public/docs/_examples/toh-2/ts/app/app.component.ts
+++ b/public/docs/_examples/toh-2/ts/app/app.component.ts
@@ -12,7 +12,7 @@ export class Hero {
     <h1>{{title}}</h1>
     <h2>My Heroes</h2>
     <ul class="heroes">
-      <li *ngFor="#hero of heroes"
+      <li *ngFor="let hero of heroes"
         [class.selected]="hero === selectedHero"
         (click)="onSelect(hero)">
         <span class="badge">{{hero.id}}</span> {{hero.name}}
diff --git a/public/docs/_examples/toh-3/ts/app/app.component.ts b/public/docs/_examples/toh-3/ts/app/app.component.ts
index 7d63d295bc..0eb4a3e42f 100644
--- a/public/docs/_examples/toh-3/ts/app/app.component.ts
+++ b/public/docs/_examples/toh-3/ts/app/app.component.ts
@@ -14,7 +14,7 @@ import {HeroDetailComponent} from './hero-detail.component';
     <h1>{{title}}</h1>
     <h2>My Heroes</h2>
     <ul class="heroes">
-      <li *ngFor="#hero of heroes"
+      <li *ngFor="let hero of heroes"
         [class.selected]="hero === selectedHero"
         (click)="onSelect(hero)">
         <span class="badge">{{hero.id}}</span> {{hero.name}}
diff --git a/public/docs/_examples/toh-4/ts/app/app.component.1.ts b/public/docs/_examples/toh-4/ts/app/app.component.1.ts
index 20ec0babc5..93abec74ed 100644
--- a/public/docs/_examples/toh-4/ts/app/app.component.1.ts
+++ b/public/docs/_examples/toh-4/ts/app/app.component.1.ts
@@ -14,7 +14,7 @@ import {HeroService} from './hero.service.1';
 @Component({
   selector: 'my-app',
   template: `
-  <div *ngFor="#hero of heroes" (click)="onSelect(hero)">
+  <div *ngFor="let hero of heroes" (click)="onSelect(hero)">
     {{hero.name}}
   </div>
   <my-hero-detail [hero]="selectedHero"></my-hero-detail>
diff --git a/public/docs/_examples/toh-4/ts/app/app.component.ts b/public/docs/_examples/toh-4/ts/app/app.component.ts
index 4505e515a1..553cf12136 100644
--- a/public/docs/_examples/toh-4/ts/app/app.component.ts
+++ b/public/docs/_examples/toh-4/ts/app/app.component.ts
@@ -14,7 +14,7 @@ import {HeroService} from './hero.service';
     <h1>{{title}}</h1>
     <h2>My Heroes</h2>
     <ul class="heroes">
-      <li *ngFor="#hero of heroes"
+      <li *ngFor="let hero of heroes"
         [class.selected]="hero === selectedHero"
         (click)="onSelect(hero)">
         <span class="badge">{{hero.id}}</span> {{hero.name}}
diff --git a/public/docs/_examples/toh-5/dart/lib/dashboard_component.html b/public/docs/_examples/toh-5/dart/lib/dashboard_component.html
index e6d5afd974..b05b58c180 100644
--- a/public/docs/_examples/toh-5/dart/lib/dashboard_component.html
+++ b/public/docs/_examples/toh-5/dart/lib/dashboard_component.html
@@ -2,7 +2,7 @@
 <h3>Top Heroes</h3>
 <div class="grid grid-pad">
 <!-- #docregion click -->
-  <div *ngFor="#hero of heroes" (click)="gotoDetail(hero)" class="col-1-4" >
+  <div *ngFor="let hero of heroes" (click)="gotoDetail(hero)" class="col-1-4" >
 <!-- #enddocregion click -->
     <div class="module hero">
       <h4>{{hero.name}}</h4>
diff --git a/public/docs/_examples/toh-5/dart/lib/heroes_component.html b/public/docs/_examples/toh-5/dart/lib/heroes_component.html
index 435dd8a5f4..d103743706 100644
--- a/public/docs/_examples/toh-5/dart/lib/heroes_component.html
+++ b/public/docs/_examples/toh-5/dart/lib/heroes_component.html
@@ -2,7 +2,7 @@
 <!-- #docregion -->
 <h2>My Heroes</h2>
 <ul class="heroes">
-  <li *ngFor="#hero of heroes"
+  <li *ngFor="let hero of heroes"
     [class.selected]="hero === selectedHero"
     (click)="onSelect(hero)">
     <span class="badge">{{hero.id}}</span> {{hero.name}}
diff --git a/public/docs/_examples/toh-5/ts/app/dashboard.component.html b/public/docs/_examples/toh-5/ts/app/dashboard.component.html
index a5bafd7702..028eab6eb3 100644
--- a/public/docs/_examples/toh-5/ts/app/dashboard.component.html
+++ b/public/docs/_examples/toh-5/ts/app/dashboard.component.html
@@ -2,7 +2,7 @@
 <h3>Top Heroes</h3>
 <div class="grid grid-pad">
 <!-- #docregion click -->
-  <div *ngFor="#hero of heroes" (click)="gotoDetail(hero)" class="col-1-4">
+  <div *ngFor="let hero of heroes" (click)="gotoDetail(hero)" class="col-1-4">
 <!-- #enddocregion click -->
     <div class="module hero">
       <h4>{{hero.name}}</h4>
diff --git a/public/docs/_examples/toh-5/ts/app/heroes.component.html b/public/docs/_examples/toh-5/ts/app/heroes.component.html
index 9bcd2ba4e8..cce1853d30 100644
--- a/public/docs/_examples/toh-5/ts/app/heroes.component.html
+++ b/public/docs/_examples/toh-5/ts/app/heroes.component.html
@@ -2,7 +2,7 @@
 <!-- #docregion -->
 <h2>My Heroes</h2>
 <ul class="heroes">
-  <li *ngFor="#hero of heroes"
+  <li *ngFor="let hero of heroes"
     [class.selected]="hero === selectedHero"
     (click)="onSelect(hero)">
     <span class="badge">{{hero.id}}</span> {{hero.name}}
diff --git a/public/docs/_examples/tutorial/ts/app/dashboard.component.html b/public/docs/_examples/tutorial/ts/app/dashboard.component.html
index b5a0a90362..dfec651c4a 100644
--- a/public/docs/_examples/tutorial/ts/app/dashboard.component.html
+++ b/public/docs/_examples/tutorial/ts/app/dashboard.component.html
@@ -1,6 +1,6 @@
 <h3>Top Heroes</h3>
 <div class="grid grid-pad">
-  <div *ngFor="#hero of heroes" class="col-1-4" (click)="gotoDetail(hero)">
+  <div *ngFor="let hero of heroes" class="col-1-4" (click)="gotoDetail(hero)">
     <div class="module hero">
       <h4>{{hero.name}}</h4>
     </div>
diff --git a/public/docs/_examples/tutorial/ts/app/heroes.component.html b/public/docs/_examples/tutorial/ts/app/heroes.component.html
index c54fdc17aa..6a973bb007 100644
--- a/public/docs/_examples/tutorial/ts/app/heroes.component.html
+++ b/public/docs/_examples/tutorial/ts/app/heroes.component.html
@@ -1,7 +1,7 @@
 <div>
   <h2>My Heroes</h2>
   <ul class="heroes">
-    <li *ngFor="#hero of heroes"
+    <li *ngFor="let hero of heroes"
       [class.selected]="hero === selectedHero"
       (click)="onSelect(hero)">
       <span class="badge">{{hero.id}}</span> {{hero.name}}
diff --git a/public/docs/_examples/typings.json b/public/docs/_examples/typings.json
index d6a258cfb6..9d5c20bc92 100644
--- a/public/docs/_examples/typings.json
+++ b/public/docs/_examples/typings.json
@@ -1,6 +1,6 @@
 {
   "ambientDependencies": {
-    "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#7de6c3dd94feaeb21f20054b9f30d5dabc5efabd",
-    "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#5c182b9af717f73146399c2485f70f1e2ac0ff2b"
+    "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654",
+    "jasmine": "registry:dt/jasmine#2.2.0+20160412134438"
   }
 }
diff --git a/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_detail/phone_detail.html b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_detail/phone_detail.html
index 51cc10aad5..7565b22776 100644
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_detail/phone_detail.html
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_detail/phone_detail.html
@@ -2,13 +2,13 @@
 <div class="phone-images">
   <img [src]="img"
        class="phone"
-       *ngFor="#img of phone?.images"
+       *ngFor="let img of phone?.images"
        [ngClass]="{active: mainImageUrl==img}">
 </div>
 <h1>{{phone?.name}}</h1>
 <p>{{phone?.description}}</p>
 <ul class="phone-thumbs">
-  <li *ngFor="#img of phone?.images">
+  <li *ngFor="let img of phone?.images">
     <img [src]="img" (click)="setImage(img)">
   </li>
 </ul>
@@ -17,7 +17,7 @@
     <span>Availability and Networks</span>
     <dl>
       <dt>Availability</dt>
-      <dd *ngFor="#availability of phone?.availability">{{availability}}</dd>
+      <dd *ngFor="let availability of phone?.availability">{{availability}}</dd>
     </dl>
   </li>
   <li>
@@ -68,7 +68,7 @@
     <span>Size and Weight</span>
     <dl>
       <dt>Dimensions</dt>
-      <dd *ngFor="#dim of phone?.sizeAndWeight?.dimensions">{{dim}}</dd>
+      <dd *ngFor="let dim of phone?.sizeAndWeight?.dimensions">{{dim}}</dd>
       <dt>Weight</dt>
       <dd>{{phone?.sizeAndWeight?.weight}}</dd>
     </dl>
diff --git a/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list.html b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list.html
index 71b84a9e88..7934a38283 100644
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list.html
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list.html
@@ -18,7 +18,7 @@
 
       <!-- #docregion list -->
       <ul class="phones">
-        <li *ngFor="#phone of phones | async | phoneFilter:query | orderBy:orderProp"
+        <li *ngFor="let phone of phones | async | phoneFilter:query | orderBy:orderProp"
             class="thumbnail phone-listing">
           <a href="#/phones/{{phone.id}}" class="thumb"><img [src]="phone.imageUrl"></a>
           <a href="#/phones/{{phone.id}}" class="name">{{phone.name}}</a>
diff --git a/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_async.html b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_async.html
index ac9f18d67d..c77090c96c 100644
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_async.html
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_async.html
@@ -18,7 +18,7 @@
 
       <!-- #docregion list -->
       <ul class="phones">
-        <li *ngFor="#phone of phones | phoneFilter:query | orderBy:orderProp"
+        <li *ngFor="let phone of phones | phoneFilter:query | orderBy:orderProp"
             class="thumbnail phone-listing">
           <a href="#/phones/{{phone.id}}" class="thumb"><img [src]="phone.imageUrl"></a>
           <a href="#/phones/{{phone.id}}" class="name">{{phone.name}}</a>
diff --git a/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.html b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.html
index a19d9a5455..1a9d3fefb3 100644
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.html
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.html
@@ -18,7 +18,7 @@
 
       <!-- #docregion list -->
       <ul class="phones">
-        <li *ngFor="#phone of phones | filter:query | orderBy:orderProp"
+        <li *ngFor="let phone of phones | filter:query | orderBy:orderProp"
             class="thumbnail phone-listing">
           <a href="#/phones/{{phone.id}}" class="thumb"><img [src]="phone.imageUrl"></a>
           <a href="#/phones/{{phone.id}}" class="name">{{phone.name}}</a>
diff --git a/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_detail/phone_detail.html b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_detail/phone_detail.html
index 51cc10aad5..7565b22776 100644
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_detail/phone_detail.html
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_detail/phone_detail.html
@@ -2,13 +2,13 @@
 <div class="phone-images">
   <img [src]="img"
        class="phone"
-       *ngFor="#img of phone?.images"
+       *ngFor="let img of phone?.images"
        [ngClass]="{active: mainImageUrl==img}">
 </div>
 <h1>{{phone?.name}}</h1>
 <p>{{phone?.description}}</p>
 <ul class="phone-thumbs">
-  <li *ngFor="#img of phone?.images">
+  <li *ngFor="let img of phone?.images">
     <img [src]="img" (click)="setImage(img)">
   </li>
 </ul>
@@ -17,7 +17,7 @@
     <span>Availability and Networks</span>
     <dl>
       <dt>Availability</dt>
-      <dd *ngFor="#availability of phone?.availability">{{availability}}</dd>
+      <dd *ngFor="let availability of phone?.availability">{{availability}}</dd>
     </dl>
   </li>
   <li>
@@ -68,7 +68,7 @@
     <span>Size and Weight</span>
     <dl>
       <dt>Dimensions</dt>
-      <dd *ngFor="#dim of phone?.sizeAndWeight?.dimensions">{{dim}}</dd>
+      <dd *ngFor="let dim of phone?.sizeAndWeight?.dimensions">{{dim}}</dd>
       <dt>Weight</dt>
       <dd>{{phone?.sizeAndWeight?.weight}}</dd>
     </dl>
diff --git a/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_list/phone_list.html b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_list/phone_list.html
index d605ff1f85..e88b4662aa 100644
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_list/phone_list.html
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_list/phone_list.html
@@ -18,7 +18,7 @@
 
       <!-- #docregion list -->
       <ul class="phones">
-        <li *ngFor="#phone of phones | async | phoneFilter:query | orderBy:orderProp"
+        <li *ngFor="let phone of phones | async | phoneFilter:query | orderBy:orderProp"
             class="thumbnail phone-listing">
           <a [routerLink]="['/Phone', {phoneId: phone.id}]" class="thumb"><img [src]="phone.imageUrl"></a>
           <a [routerLink]="['/Phone', {phoneId: phone.id}]" class="name">{{phone.name}}</a>
diff --git a/public/docs/_examples/user-input/ts/app/little-tour.component.ts b/public/docs/_examples/user-input/ts/app/little-tour.component.ts
index 800837f6c1..0d91cbc604 100644
--- a/public/docs/_examples/user-input/ts/app/little-tour.component.ts
+++ b/public/docs/_examples/user-input/ts/app/little-tour.component.ts
@@ -11,7 +11,7 @@ import {Component} from 'angular2/core';
 
     <button (click)=addHero(newHero.value)>Add</button>
 
-    <ul><li *ngFor="#hero of heroes">{{hero}}</li></ul>
+    <ul><li *ngFor="let hero of heroes">{{hero}}</li></ul>
   `
 })
 export class LittleTourComponent {
diff --git a/public/docs/js/latest/_data.json b/public/docs/js/latest/_data.json
index 9d6dc0706b..540491ae00 100644
--- a/public/docs/js/latest/_data.json
+++ b/public/docs/js/latest/_data.json
@@ -3,7 +3,7 @@
     "icon": "home",
     "title": "Angular Docs",
     "menuTitle": "Docs Home",
-    "banner": "Welcome to <b>Angular in JavaScript</b>! The current Angular 2 release is <b>beta.16</b>. Please consult the <a href='https://github.com/angular/angular/blob/master/CHANGELOG.md' target='_blank'>  Change Log</a> about recent enhancements, fixes, and breaking changes."
+    "banner": "Welcome to <b>Angular in JavaScript</b>! The current Angular 2 release is <b>beta.17</b>. Please consult the <a href='https://github.com/angular/angular/blob/master/CHANGELOG.md' target='_blank'>  Change Log</a> about recent enhancements, fixes, and breaking changes."
   },
 
   "quickstart": {
diff --git a/public/docs/ts/latest/_data.json b/public/docs/ts/latest/_data.json
index aaaf80cd91..a9abd59402 100644
--- a/public/docs/ts/latest/_data.json
+++ b/public/docs/ts/latest/_data.json
@@ -3,7 +3,7 @@
     "icon": "home",
     "title": "Angular Docs",
     "menuTitle": "Docs Home",
-    "banner": "Welcome to <b>Angular in TypeScript</b>! The current Angular 2 release is <b>beta.16</b>. Please consult the <a href='https://github.com/angular/angular/blob/master/CHANGELOG.md' target='_blank'>  Change Log</a> about recent enhancements, fixes, and breaking changes."
+    "banner": "Welcome to <b>Angular in TypeScript</b>! The current Angular 2 release is <b>beta.17</b>. Please consult the <a href='https://github.com/angular/angular/blob/master/CHANGELOG.md' target='_blank'>  Change Log</a> about recent enhancements, fixes, and breaking changes."
   },
 
   "quickstart": {
diff --git a/tools/plunker-builder/indexHtmlTranslator.js b/tools/plunker-builder/indexHtmlTranslator.js
index 2b48b5351d..72cb675791 100644
--- a/tools/plunker-builder/indexHtmlTranslator.js
+++ b/tools/plunker-builder/indexHtmlTranslator.js
@@ -41,52 +41,52 @@ var _rxData = [
   {
     pattern: 'script',
     from: 'node_modules/angular2/bundles/angular2.dev.js',
-    to: 'https://code.angularjs.org/2.0.0-beta.16/angular2.dev.js'
+    to: 'https://code.angularjs.org/2.0.0-beta.17/angular2.dev.js'
   },
   {
     pattern: 'script',
     from: 'node_modules/angular2/bundles/angular2-all.umd.dev.js',
-    to: 'https://code.angularjs.org/2.0.0-beta.16/angular2-all.umd.dev.js'
+    to: 'https://code.angularjs.org/2.0.0-beta.17/angular2-all.umd.dev.js'
   },
   {
     pattern: 'script',
     from: 'node_modules/angular2/bundles/angular2-all.umd.js',
-    to: 'https://code.angularjs.org/2.0.0-beta.16/angular2-all.umd.dev.js'
+    to: 'https://code.angularjs.org/2.0.0-beta.17/angular2-all.umd.dev.js'
   },
   {
     pattern: 'script',
     from: 'node_modules/angular2/bundles/angular2-polyfills.js',
-    to: 'https://code.angularjs.org/2.0.0-beta.16/angular2-polyfills.js'
+    to: 'https://code.angularjs.org/2.0.0-beta.17/angular2-polyfills.js'
   },
   {
     pattern: 'script',
     from: 'node_modules/rxjs/bundles/Rx.js',
-    to: 'https://code.angularjs.org/2.0.0-beta.16/Rx.js'
+    to: 'https://code.angularjs.org/2.0.0-beta.17/Rx.js'
   },
   {
     pattern: 'script',
     from: 'node_modules/rxjs/bundles/Rx.umd.js',
-    to: 'https://code.angularjs.org/2.0.0-beta.16/Rx.umd.js'
+    to: 'https://code.angularjs.org/2.0.0-beta.17/Rx.umd.js'
   },
   {
     pattern: 'script',
     from: 'node_modules/angular2/bundles/router.dev.js',
-    to: 'https://code.angularjs.org/2.0.0-beta.16/router.dev.js'
+    to: 'https://code.angularjs.org/2.0.0-beta.17/router.dev.js'
   },
   {
     pattern: 'script',
     from: 'node_modules/angular2/bundles/http.dev.js',
-    to: 'https://code.angularjs.org/2.0.0-beta.16/http.dev.js'
+    to: 'https://code.angularjs.org/2.0.0-beta.17/http.dev.js'
   },
   {
     pattern: 'script',
     from: 'node_modules/angular2/bundles/testing.dev.js',
-    to: 'https://code.angularjs.org/2.0.0-beta.16/testing.dev.js'
+    to: 'https://code.angularjs.org/2.0.0-beta.17/testing.dev.js'
   },
   {
     pattern: 'script',
     from: 'node_modules/angular2/es6/dev/src/testing/shims_for_IE.js',
-    to: 'https://npmcdn.com/angular2@2.0.0-beta.16/es6/dev/src/testing/shims_for_IE.js'
+    to: 'https://npmcdn.com/angular2@2.0.0-beta.17/es6/dev/src/testing/shims_for_IE.js'
   },
   {
     pattern: 'script',