diff --git a/modules/angular2/src/core/application_tokens.ts b/modules/angular2/src/core/application_tokens.ts
index 24cca2b943..d6f4feb39f 100644
--- a/modules/angular2/src/core/application_tokens.ts
+++ b/modules/angular2/src/core/application_tokens.ts
@@ -7,7 +7,7 @@ import {CONST_EXPR, Math, StringWrapper} from 'angular2/src/facade/lang';
 export const APP_COMPONENT_REF_PROMISE = CONST_EXPR(new OpaqueToken('Promise<ComponentRef>'));
 
 /**
- * An {@link angular2/di/OpaqueToken} representing the application root type in the {@link
+ * An {@link OpaqueToken-class.html} representing the application root type in the {@link
  * Injector}.
  *
  * ```
diff --git a/modules/angular2/src/core/di/provider.ts b/modules/angular2/src/core/di/provider.ts
index 4c74037512..89e7c0e726 100644
--- a/modules/angular2/src/core/di/provider.ts
+++ b/modules/angular2/src/core/di/provider.ts
@@ -354,7 +354,7 @@ export class ResolvedFactory {
  * to an existing `token`.
  * See {@link ProviderBuilder} for more details.
  *
- * The `token` is most commonly a class or {@link angular2/di/OpaqueToken}.
+ * The `token` is most commonly a class or {@link OpaqueToken-class.html}.
  *
  * @deprecated
  */
diff --git a/modules/angular2/src/core/metadata.ts b/modules/angular2/src/core/metadata.ts
index 7637ece7f2..cebc0b15ba 100644
--- a/modules/angular2/src/core/metadata.ts
+++ b/modules/angular2/src/core/metadata.ts
@@ -504,8 +504,8 @@ export interface HostListenerFactory {
  *
  * ## Lifecycle hooks
  *
- * When the component class implements some {@link angular2/lifecycle_hooks} the callbacks are
- * called by the change detection at defined points in time during the life of the component.
+ * When the component class implements some {@link ../../guide/lifecycle-hooks.html} the callbacks
+ * are called by the change detection at defined points in time during the life of the component.
  *
  * ### Example
  *
@@ -833,8 +833,8 @@ export var Component: ComponentFactory =
  *
  * ## Lifecycle hooks
  *
- * When the directive class implements some {@link angular2/lifecycle_hooks} the callbacks are
- * called by the change detection at defined points in time during the life of the directive.
+ * When the directive class implements some {@link ../../guide/lifecycle-hooks.html} the callbacks
+ * are called by the change detection at defined points in time during the life of the directive.
  *
  * ### Example
  *
diff --git a/modules/angular2/src/core/metadata/directives.ts b/modules/angular2/src/core/metadata/directives.ts
index 0f69f35dbf..2670fd8ccc 100644
--- a/modules/angular2/src/core/metadata/directives.ts
+++ b/modules/angular2/src/core/metadata/directives.ts
@@ -321,8 +321,8 @@ import {ViewEncapsulation} from 'angular2/src/core/metadata/view';
  *
  * ## Lifecycle hooks
  *
- * When the directive class implements some {@link angular2/lifecycle_hooks} the callbacks are
- * called by the change detection at defined points in time during the life of the directive.
+ * When the directive class implements some {@link ../../guide/lifecycle-hooks.html} the callbacks
+ * are called by the change detection at defined points in time during the life of the directive.
  *
  * ### Example
  *
@@ -777,8 +777,8 @@ export class DirectiveMetadata extends InjectableMetadata {
  *
  * ## Lifecycle hooks
  *
- * When the component class implements some {@link angular2/lifecycle_hooks} the callbacks are
- * called by the change detection at defined points in time during the life of the component.
+ * When the component class implements some {@link ../../guide/lifecycle-hooks.html} the callbacks
+ * are called by the change detection at defined points in time during the life of the component.
  *
  * ### Example
  *
diff --git a/modules/angular2/src/router/instruction.ts b/modules/angular2/src/router/instruction.ts
index eda67fce83..e05f419b33 100644
--- a/modules/angular2/src/router/instruction.ts
+++ b/modules/angular2/src/router/instruction.ts
@@ -296,7 +296,7 @@ export class RedirectInstruction extends ResolvedInstruction {
  * to route lifecycle hooks, like {@link CanActivate}.
  *
  * `ComponentInstruction`s are [hash consed](https://en.wikipedia.org/wiki/Hash_consing). You should
- * never construct one yourself with "new." Instead, rely on {@link Router/RouteRecognizer} to
+ * never construct one yourself with "new." Instead, rely on router's internal recognizer to
  * construct `ComponentInstruction`s.
  *
  * You should not modify this object. It should be treated as immutable.