diff --git a/CHANGELOG.md b/CHANGELOG.md
index f04d1d56383..f35fa986ba0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,7 +30,7 @@
       <my-cmp (myEvent)="action()">
       <my-cmp [(myProp)]="prop">
       <input #myInput>`,
-      <template ngFor="#my-item" [ngForOf]=items #myIndex="index">
+      <template ngFor="#myItem" [ngForOf]=items #myIndex="index">
   ```
 
   The full migration instruction can be found at [angular2/docs/migration/kebab-case.md](https://github.com/angular/angular/blob/master/modules/angular2/docs/migration/kebab-case.md).
diff --git a/modules/angular2/docs/migration/kebab-case.md b/modules/angular2/docs/migration/kebab-case.md
index 4711570ec36..553c73c3e9f 100644
--- a/modules/angular2/docs/migration/kebab-case.md
+++ b/modules/angular2/docs/migration/kebab-case.md
@@ -38,7 +38,7 @@ Notes:
   - `<my-cmp (my-event)="action()">` should be changed to `<my-cmp (myEvent)="action()">`,
   - `<my-cmp [(my-prop)]="prop">` should be changed to `<my-cmp [(myProp)]="prop">`,
   - `<input #my-input>` should be changed to `<input #myInput>`,
-  - `<template ng-for #my-item [ng-for-of]=items #my-index="index">` should be changed to `<template ngFor #my-item [ngForOf]=items #myIndex="index">`,
+  - `<template ng-for #my-item [ng-for-of]=items #my-index="index">` should be changed to `<template ngFor #myItem [ngForOf]=items #myIndex="index">`,
 
   Note: while the tag names are now case-sensitive the best practice is to keep them lower-dash-cased so that the browser
   treat them as custom elements. Using dashes in custom element names is required by the [Custom Element HTML Spec](http://www.w3.org/TR/custom-elements/#concepts).
diff --git a/modules/angular2/src/core/metadata.ts b/modules/angular2/src/core/metadata.ts
index 33291907194..0046aea0d63 100644
--- a/modules/angular2/src/core/metadata.ts
+++ b/modules/angular2/src/core/metadata.ts
@@ -1060,8 +1060,8 @@ export var Attribute: AttributeFactory = makeParamDecorator(AttributeMetadata);
  *
  * ```html
  * <seeker>
- *   <div #find-me>...</div>
- *   <div #find-me-too>...</div>
+ *   <div #findMe>...</div>
+ *   <div #findMeToo>...</div>
  * </seeker>
  *
  *  @Component({